Merge "Merge "Clock Settings selection animation (2/2)" into udc-dev am: 04ba95fad9 am: d31ee17831"