Merge "Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c86 am: ca10fdaa31 am: 62b824a3f8" into rvc-qpr-dev-plus-aosp