Merge "NsdService does not clean up after exiting clients"