Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev