Merge "Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c am: ca10fdaa am: 62b824a3" into rvc-qpr-dev-plus-aosp