Merge "Fix the title of the language selection list" into nyc-dev