Merge "Restart USB stack if data transfer becomes unavailable" into oc-dev