Merge "Fix broken assumptions in LocalePicker."