Merge "Revert "Add experiment flag for tethering refactor"" into main