Merge "Enable new time zone picker" into pi-dev