Rollback invalidated transaction: catch them earlier

[jdavcs]

This should handle the PendingRollbackError. Follow-up to #17280

How to test the changes?

(Select all options that apply)

• I've included appropriate automated tests.
• This is a refactoring of components with existing test coverage.
• Instructions for manual testing are as follows:
  1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

• I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

[mvdbeek]

I suppose you meant to target 23.2 ?

[jdavcs]

@mvdbeek - thank you!