Issue #2941189 by DanielVeza, longwave, smustgrave, xjm, tim.plunkett:...

Issue #2941189 by DanielVeza, longwave, smustgrave, xjm, tim.plunkett: Confirmation form for disabling per-entity layout overrides shows a success message and should not

(cherry picked from commit 47258e9e)

core/modules/field_ui/src/Form/EntityDisplayFormBase.php

@@ -579,7 +579,12 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       $this->saveDisplayStatuses($statuses);
     }
 
-    $this->messenger()->addStatus($this->t('Your settings have been saved.'));
+    // The saved message may not be needed in some cases. An example of
+    // this is in LayoutBuilderEntityViewDisplayForm which can redirect
+    // the user to a confirmation form before the settings are saved.
+    if (!$form_state->getRedirect()) {
+      $this->messenger()->addStatus($this->t('Your settings have been saved.'));
+    }
   }
 
   /**

core/modules/layout_builder/tests/src/Functional/LayoutBuilderSectionStorageTest.php

@@ -91,6 +91,7 @@ public function testRenderByContextAwarePluginDelegate() {
     // Disabling defaults does not prevent the section storage from running.
     $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default');
     $this->submitForm(['layout[enabled]' => FALSE], 'Save');
+    $this->assertSession()->pageTextNotContains('Your settings have been saved');
     $page->pressButton('Confirm');
     $assert_session->pageTextContains('Layout Builder has been disabled');
     $this->drupalGet('node/1');