Merge "Fix a check failure in the CC background transition."