Merge "cec: refine CEC enable/disable logic."