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

Change-Id: I132ef8be055b8187d4087177712a06d1b1ce8a6e