Merge "Allow other app enter PiP when exiting current one" into tm-qpr-dev