ENGCOM-2164: [Forwardport] Prevent layout cache corruption in edge case #16487

Author: Stanislav Idolov

lib/internal/Magento/Framework/View/Model/Layout/Merge.php

@@ -443,6 +443,9 @@ public function load($handles = [])
         if ($result) {
             $this->addUpdate($result);
             $this->pageLayout = $this->_loadCache($cacheIdPageLayout);
+            foreach ($this->getHandles() as $handle) {
+                $this->allHandles[$handle] = $this->handleProcessed;
+            }
             return $this;
         }