Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev