Merge "Allow resume of parent activity that launches PiP" into qt-r1-dev