Merge changes Ifeddf8c8,I265d573d into main

* changes:
  [Tether] flip instant_tether for teamfood
  [Tether] Prefer mergedCarrierEntry() over connectedEntry()