Merge "Leak UsbDeviceConnection fd if not closed"