Merge "adb: Handle adb connect in a thread"