MC-35179: Unable to save "No layout updates" for category

Author: Roman Lytvynenko

app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php

@@ -12,7 +12,6 @@
 
 use Magento\Catalog\Model\Category\DataProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -35,8 +34,8 @@ class SetPageLayoutDefaultValue
     private $scopeConfig;
 
     /**
-     * @param ScopeConfigInterface|null $scopeConfig
-     * @param StoreManagerInterface|null $storeManager
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
      * @param string $defaultValue
      */
     public function __construct(