Merge "Merge "Clock Settings selection animation (1/2)" into udc-dev am: 701f7067cc am: b3e8233ca0"