Merge "Fix potential deadlock in ServiceWatcher"