Merge "Dismiss PiP to split screen if applicable" into rvc-dev