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

Change-Id: I836e082a6958ba15aed5e43e12e83e42af6752bd