Merge changes from topic 'usb_bugfix' into nyc-mr2-dev

* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.