Merge "Fix EnterPipToOtherOrientation failure" into main