Merge "Remove DefaultState in NsdService" into main