Merge "Prevent Typeface recreation for default flex clock" into main