Merge "Fix trampoline activities when relaunching PiP"