Merge "Improve HdmiControlManager#getActiveSource"