Merge "Refactor Typeface construction logic"