[Forwardport] Prevent layout cache corruption in edge case#16487

magento-engcom-team merged 1 commit intomagento:2.3-developmagento/magento2:2.3-developfrom

gelanivishal:2.3-develop-PR-port-12314gelanivishal/magento2:2.3-develop-PR-port-12314Copy head branch name to clipboard