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