diff --git a/core/modules/layout/lib/Drupal/layout/Config/DisplayBase.php b/core/modules/layout/lib/Drupal/layout/Config/DisplayBase.php
index 6322e22..afe3229 100644
--- a/core/modules/layout/lib/Drupal/layout/Config/DisplayBase.php
+++ b/core/modules/layout/lib/Drupal/layout/Config/DisplayBase.php
@@ -112,7 +112,11 @@ public function mapBlocksToLayout(LayoutInterface $layout) {
       }
       // Finally, fall back to dumping everything in the layout's first region.
       else {
-        $info['region'] = reset($layout_regions_indexed);
+        if (!isset($first_region)) {
+          reset($layout_regions);
+          $first_region = key($layout_regions);
+        }
+        $info['region'] = $first_region;
       }
 
       $remapped_config[$name] = $info;
@@ -127,8 +131,8 @@ public function mapBlocksToLayout(LayoutInterface $layout) {
   public function getAllRegionTypes() {
     $types = array();
     foreach ($this->blockInfo as $info) {
-      $types[$info['region-type']] = TRUE;
+      $types[] = $info['region-type'];
     }
-    return array_keys($types);
+    return array_unique($types);
   }
 }
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 a4270e1..d954832 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
@@ -150,7 +150,7 @@ public function setLayout($plugin_id) {
   public function generateUnboundDisplay($id, $entity_type = 'unbound_display') {
     $block_info = $this->getAllBlockInfo();
     foreach ($block_info as &$info) {
-      unset ($info['region']);
+      unset($info['region']);
     }
 
     $values = array(