Merge "Do not restart tethering while enabling tethering." into pi-dev