Entity redirect assumes its always a node

Problem/Motivation

FormsStepsAlter::setNextRoute assumes the entity redirect is redirecting back to a node. and uses "entity.node.canonical" which throws a MissingMandatoryParametersException
Symfony\Component\Routing\Exception\MissingMandatoryParametersException: Some mandatory parameters are missing ("node") to generate a URL for route "entity.node.canonical". in Drupal\Core\Routing\UrlGenerator->doGenerate()

Steps to reproduce

Create steps as usual, but if you choose "current entity" in Redirection policy: once you finalize the form and submit it will throw the above error

Proposed resolution

Including a patch to use entity.[entity type id].canonical when redirecting.