Merge "Refactor ServiceWatcher"