Merge "Tidy up changes for TimeZoneDetectorStrategy"