Merge "Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c86 am: 52abac27f1 am: ffcb0249c9" into rvc-qpr-dev-plus-aosp