Merge "Fix inability to select default clock color option" into main