Merge "Fix suggestions in the language selector" into nyc-dev