Merge "Fix UsbDeviceManager null object reference"