Merge pull request awalol#72 from TerryFrench/wake-keep-usb

fix(wake): wake-from-S3 after controller off, plus wake-and-resleep retry