Merge "Add retries to CEC detection"