Merge "Fix disconnection bug in ServiceWatcher" into rvc-dev