Merge "Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c am: 52abac27 am: ffcb0249" into rvc-qpr-dev-plus-aosp