Merge "Disallow legacy tether() API starting in B" into main