Merge branch 'MC-18726' into MC-18726-and-18727

Author: vzabaznov

app/code/Magento/Store/Model/StoreSwitcher/ManagePrivateContent.php

@@ -37,9 +37,12 @@ public function __construct(
     }
 
     /**
+     * Update version of private content on each store switch.
+     *
      * @param StoreInterface $fromStore store where we came from
      * @param StoreInterface $targetStore store where to go to
      * @param string $redirectUrl original url requested for redirect after switching
+     *
      * @return string redirect url
      * @throws CannotSwitchStoreException
      */
@@ -53,7 +56,7 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
                 ->setHttpOnly(false);
             $this->cookieManager->setPublicCookie(
                 \Magento\Framework\App\PageCache\Version::COOKIE_NAME,
-                'should_be_updated',
+                \uniqid('updated-', true),
                 $publicCookieMetadata
             );
         } catch (\Exception $e) {