Merge "Fix CEC init twice in normal boot"