Merge "Fix tethering when switching default connection" into honeycomb