Merge "HID: Remove device from database in error case"