Merge "Remove Activity if it enters PiP without window" into rvc-dev