Merge "Show only the language if there's only one locale for the language." into jb-dev