Merge "Update clock color UI text & spacing" into main