Merge "Add feature flag for typeface redesign" into main