Merge "Update clock color option views" into main