Merge "Unhide PHONETIC_NAME_STYLE fields"