Merge "Show locale in region list even if suggested in language list" into nyc-dev