Merge "Add coverage for StopTetheringCallback methods" into main