Merge "Update FontFamily_Delegate following Change Ia23ee6a7"