Merge changes I1f9a8e93,I74ec2bf3 into main

* changes:
  Exit immersive state on rotation
  Restore to pre-immersive bounds on immersive exit