Merge "Change Typeface redesign flag to readonly" into main