Merge "Do not send socket destroyed on unregistration"