Merge "Close the TV PiP menu when losing window focus." into tm-dev