Merge "Handle incoming active source-related commands for HdmiControlService"