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

Change-Id: Ied0c8c18d8d6554f59f896faa6ce9f3cbd5574aa