Merge "TV PiP: don't load app provided icon from URI" into main