Merge "p2p: send discovery state change event for service discovery" into sc-dev