Merge "Use isTetheringFeatureNotChickenedOut for kill switch" into main