Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev