Merge "Fixes issues where the PiP menu activity is out of sync."