Merge "Skip finishing menu activity when dismissing PiP" into pi-dev