Merge "Only set mdns_registered on success"