Merge "Fix status bar window height not being updated on certain rotations" into main