Merge "Fix crash in new time zone picker."