Merge "Update Typeface_Delegate following Change Ied73189b"