Merge "Fix a deadlock in service discovery callbacks"