Merge "Fix crash on hotplug disconnect"