Merge "Update the system font implementation for new API change"