Merge "Enter PiP with fixed rotation restore reentry state correctly" into main