Merge "Preferences: Fix timezone selectors"