v3: Increase the device HID interface removal timeout. For some tests it needs more time for some reason. Fix an typo in some variable name and remove now unnecessary goto / label.
I kept !1841 change too, as it still can cause test failures depending on if the prefix is already initialized or not.