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

Change-Id: I2745a8ab3e22a49975bc0311ef8bf7bfc5e109e9