Merge "SDM: Remove first cycle special handling in ColorManager"