Merge "Track API changes TimeZoneDetector -> TimeManager" into sc-dev