Merge "Clock Settings selection animation (1/2)" into udc-dev