Merge changes If0b58d44,If3213856 into main

* changes:
  Remove stale TODO
  Revert "Mark blanket offer as transport primary"