Merge "[NavBar Jank] Avoid calling RotationPolicy.isRotationLocked() on main thread" into main