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

Change-Id: I8f186a0c32ebed1ce8f40106b82d58a7146dbdb1