Merge "Move ServiceWatcher into package" into sc-dev