Merge "profcollect: Fix NPE when invoking UsbManager" into main