Merge "Add an AUTO_TIME_ZONE setting so that we can switch timezones while keeping correct time."