Merge "Reintroduce a timeout on going-away transition" into main