Merge "Remove the feature flag and dead code for the old time zone picker"