Merge "Simplify tethering active session counting" into main