Merge "Show only up to two locales in Settings" into nyc-dev