Sean Adams-Hiett · 6fcadc37
--- a/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
+++ b/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
      $this->unsetThirdPartySetting('layout_builder', 'sections');
    }
    else {
-      $this->setThirdPartySetting('layout_builder', 'sections', array_values($sections));
+      foreach (array_values($sections) as $weight => $section) {
+        $section->setWeight($weight);
+        $sections[$section->getUuid()] = $section;
--- a/core/modules/layout_builder/layout_builder.install
+++ b/core/modules/layout_builder/layout_builder.install
+  $db = \Drupal::database();
+  $entity_type_manager = \Drupal::entityTypeManager();
+
+  $section_column = 'layout_builder__layout_section';
+
+  // Get a list of content entities.
+  $entity_types = array_filter($entity_type_manager
+    ->getDefinitions(), function ($value) {
+      return $value instanceof ContentEntityType;
+    });
+
+  $tables = [];
+
+  // Compile a list of tables to update.
+  /** @var Drupal\Core\Entity\ContentEntityType $entity_type */
+  foreach ($entity_types as $key => $entity_type) {
--- a/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
+++ b/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
    else {
      foreach (array_values($sections) as $weight => $section) {
        $section->setWeight($weight);
-        $sections[$section->getUuid()] = $section;
--- a/core/modules/layout_builder/src/SectionListTrait.php
+++ b/core/modules/layout_builder/src/SectionListTrait.php
+    if (Uuid::isValid($uuid)) {
+      foreach ($this->getSections() as $section) {
+        if ($section->getUuid() === $uuid) {
+          return $section;
+        }
+      }
+    }
+
+    throw new \Exception(sprintf('Invalid uuid "%s"', $uuid));
  }

-    return $this->getSections()[$delta];
+  /**
+   * {@inheritdoc}
+   */
+  public function getSectionByDelta($delta) {
--- a/core/modules/layout_builder/src/SectionListTrait.php
+++ b/core/modules/layout_builder/src/SectionListTrait.php
-  public function getSection($delta) {
-    if (!$this->hasSection($delta)) {
-      throw new \OutOfBoundsException(sprintf('Invalid delta "%s"', $delta));
+  public function getSection($uuid) {
+    if (is_int($uuid)) {
+      @trigger_error('Calling ' . __FUNCTION__ . '() with delta as an argument is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Instead you should pass uuid or if you want to get section by delta then use \Drupal\layout_builder\SectionListTrait::getSectionByDelta($delta). See https://www.drupal.org/node/3401886', E_USER_DEPRECATED);
+    }
+    if (Uuid::isValid($uuid)) {
+      foreach ($this->getSections() as $section) {
+        if ($section->getUuid() === $uuid) {
+          return $section;
+        }
+      }
+    }
+
+    throw new \Exception(sprintf('Invalid uuid "%s"', $uuid));
--- a/core/modules/layout_builder/src/SectionListTrait.php
+++ b/core/modules/layout_builder/src/SectionListTrait.php
      throw new \Exception('A blank section must only be added to an empty list');
    }

-    $this->appendSection(new Section('layout_builder_blank'));
+    $this->appendSection((new Section('layout_builder_blank'))->setUuid(\Drupal::service('uuid')->generate())->setWeight(0));