Merge "CEC: Handle <Active Source> from AVR properly" into nyc-dev