diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
index d954832..9b1d582 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
+++ b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
@@ -25,6 +25,7 @@
  *   config_prefix = "display.bound",
  *   entity_keys = {
  *     "id" = "id",
+ *     "label" = "label",
  *     "uuid" = "uuid"
  *   }
  * )
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php
index 5450e2c..693f270 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php
+++ b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php
@@ -28,6 +28,7 @@
  *   config_prefix = "display.unbound",
  *   entity_keys = {
  *     "id" = "id",
+ *     "label" = "label",
  *     "uuid" = "uuid"
  *   }
  * )
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php b/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
index ce82c65..4e8492e 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
+++ b/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
@@ -111,6 +111,8 @@ protected function iterateDirectories($dir, $provider) {
         if (!isset($this->derivatives[$key]['template'])) {
           $this->derivatives[$key]['template'] = $fileinfo->getBasename('.yml');
         }
+        // Store provider for the layout.
+        $this->derivatives[$key]['provider'] = $provider;
       }
     }
   }