Merge "Show phonetic name only when it doesn't equal display name." into nyc-dev