Merge "Refactor ServiceWatcher" into sc-dev