Merge branch 'no_usb_debug_windows'