Preserve previous usb state when suspending / restore on resume

Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
Merge remote-tracking branch 'wesen/bug/usb-resume'