Merge "Fix expanding PiP on TV" into rvc-dev