Merge "Revert "Consolidate clock color logic"" into main