Merge changes from topic "UsbManager-changes"

* changes:
  Usb changes and strings for connected devices 2.0
  Refactor and clean up USB, add tests