Merge "Fix clock settings slider color (2/2)" into udc-dev