Merge "Fix NullPointerException on NsdService" into main