Merge "Fix LocalePicker locale filtering."