Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev