Merge "Fix rebind issue in ServiceWatcher"