Merge "PiP: Move resetting mAllowTouches into scope of MenuView" into sc-dev