Merge "Include the FooterView height in the stackHeight stored in NotificationViewHeightRepository" into main