Merge "CEC: Refactor HdmiCecDefault class"