Merge "Port stepping animation to FlexClockView" into main