Merge "Merge "Use normal rotation while PiP is toggling or active" into rvc-dev am: 3b648e41 am: ebbfb1b1 am: b300644a" into rvc-qpr-dev-plus-aosp