Merge "Fix layout for time zone picker"