Merge "Don't destroy usb debugging dialog for emulator if usb is not connected." into sc-dev