Merge "Fix NPE on UsbManager in w/o usb devices"