[Git][ghc/ghc][wip/T26343] 38 commits: Revert "STM: don't create a transaction in the rhs of catchRetry# (#26028)"