Merge changes from topics 'usb_bugfixes', 'usb_bugfixes2'

* changes:
  Revert: Remove the kick from config switches in UsbDeviceManager
  Clean up persistent usb state on boot.