Merge "Remove the feature flag for time zone picker"