Merge "Eagerly update ClockSize & isLargeClockVisible flows" into main