Merge "Move ServiceWatcher and dependencies to core" into main