Merge "TV Pip fixes after menu migration to Window"