Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev

        // Only select time zone explicitly if there are more than one time zones in a region

        if (!assumeOneTimeZoneInRegion) {

            wait(By.text("Time Zone"));

            wait(By.text("Time zone"));

            selectItemInList(new UiSelector().textContains(timezone))

                    .click();

        }