Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8' * commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8': Add a way to override the display names for locales in the locale picker.
Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8' * commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8': Add a way to override the display names for locales in the locale picker.