Merge "Fix repetitive clock color options when onResume" into main