I'm happy to see this worked for you also. The services are set are set as follows on my PC:
- Function Discovery Provider Host: Manual start, not running
- Function Discovery Resource Publication: Automatic, running
- SSDP Discovery: Manual, running (I don't know why it is running if it is set to manual start without a trigger)
- UPnP Device Host: Manual, not running
I've set my network profile as private while configuring Windows after install.
Hopefully, the trigger will not reappear in future updates. At least, we know what to do if it does.
I agree with you, MS should have fixed this a long time ago.