Merge "Make NsdService only start the native daemon when needed and automatically clean it up." into sc-dev