Merge "Fix NPE with UsbManager" into main