Merge "Replace ClockFontAxisSetting" into main