Merge "Merge "Use normal rotation while PiP is toggling or active" into rvc-dev am: 3b648e41bc am: ebbfb1b147 am: b300644acc" into rvc-qpr-dev-plus-aosp