Merge "Migrate CEC version Setting to use HdmiCecConfig"