Merge "Allow resume of parent activity that launches PiP" into qt-r1-dev am: 2c89115c am: d820cc2e am: 6e141ce1 Change-Id: Ib7d224724a5c2bdf3248fa118167d2a34815fe90