Resolve #3352265

This MR merges in the latest changes from the 8.x-2.x branch and also adds in the layout builder fix. Closes #3352265

entity_redirect.module

@@ -286,7 +286,7 @@ function entity_redirect_submit($form, FormStateInterface $form_state) {
         break;
 
       case 'layout_builder':
-        $form_state->setRedirectUrl(Url::fromUri($entity->toUrl('canonical', ['absolute' => TRUE])->toString() . '/layout'));
+        $form_state->setRedirect("layout_builder.overrides.{$entity_type->id()}.view", [$entity_type->id() => $entity->id()]);
         break;
 
       case 'external':