Merge "Fix tethering re-enable after edit." into nyc-dev