Merge "Update Typeface_Delegate to be latest methods"