Merge "Add null check on UsbManager" into sc-dev