Merge "Don't dismiss adb authorization prompt upon USB disconnect."