Merge "TV: handle PiP density changes" into main