Merge "Rotation-invariant status bar layout calculator" into sc-dev