Merge "Update FontStyle location in minikin."