Merge "Fix issue where clock color would not change" into sc-dev