Merge "Take apart LocalePicker#onListItemClick() into two"