Merge "Fix TV doesn't send <Active Source> on boot up"