Merge "Allow resume of parent activity that launches PiP" into qt-r1-dev
am: 2c89115cb7

Change-Id: I84cda5d39236b4227203e82fdfe1e9d0acdc8f1c