Merge "Make Tethering not disconnect on every net change."