Merge "Performance/jank improvements to AnalogClock" into sc-dev