ENGCOM-3786: Issue #19609 FIXED #19880

 - Merge Pull Request #19880 from maheshWebkul721/magento2:issue-19609
 - Merged commits:
   1. 1bae0d8
   2. 7a2d534
   3. fad225b
   4. a1de67a
   5. b5f866f
   6. 2055291
   7. f6b8e49
   8. 8f4dcc1
   9. d397810

Author: magento-engcom-team

app/code/Magento/Config/Block/System/Config/Form.php

@@ -134,6 +134,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
      * @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
      * @param array $data
+     * @param SettingChecker|null $settingChecker
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -143,13 +144,15 @@ public function __construct(
         \Magento\Config\Model\Config\Structure $configStructure,
         \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
         \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
-        array $data = []
+        array $data = [],
+        SettingChecker $settingChecker = null
     ) {
         parent::__construct($context, $registry, $formFactory, $data);
         $this->_configFactory = $configFactory;
         $this->_configStructure = $configStructure;
         $this->_fieldsetFactory = $fieldsetFactory;
         $this->_fieldFactory = $fieldFactory;
+        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
 
         $this->_scopeLabels = [
             self::SCOPE_DEFAULT => __('[GLOBAL]'),
@@ -366,9 +369,8 @@ protected function _initElement(
 
         $sharedClass = $this->_getSharedCssClass($field);
         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
+        $isReadOnly = $this->getReadOnly($field, $path);
 
-        $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
-            ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
         $formField = $fieldset->addField(
             $elementId,
             $field->getType(),
@@ -417,7 +419,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
     {
         $data = $this->getAppConfigDataValue($path);
 
-        $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
+        $placeholderValue = $this->settingChecker->getPlaceholderValue(
             $path,
             $this->getScope(),
             $this->getStringScopeCode()
@@ -797,6 +799,25 @@ private function getAppConfig()
         return $this->appConfig;
     }
 
+    /**
+     * Check Path is Readonly
+     * 
+     * @param \Magento\Config\Model\Config\Structure\Element\Field $field
+     * @param string $path
+     * @return boolean
+     */
+    private function getReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
+    {
+        $isReadOnly = $this->settingChecker->isReadOnly(
+            $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        if (!$isReadOnly) {
+            $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+                ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+        }
+        return $isReadOnly;
+    }
+
     /**
      * Retrieve deployment config data value by path
      *

app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php

@@ -102,6 +102,9 @@ protected function setUp()
             \Magento\Config\Block\System\Config\Form\Fieldset\Factory::class
         );
         $this->_fieldFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Field\Factory::class);
+        $settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->_coreConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
 
         $this->_backendConfigMock = $this->createMock(\Magento\Config\Model\Config::class);
@@ -153,6 +156,7 @@ protected function setUp()
             'fieldsetFactory' => $this->_fieldsetFactoryMock,
             'fieldFactory' => $this->_fieldFactoryMock,
             'context' => $context,
+            'settingChecker' => $settingCheckerMock,
         ];
 
         $objectArguments = $helper->getConstructArguments(\Magento\Config\Block\System\Config\Form::class, $data);
@@ -532,7 +536,7 @@ public function testInitFields(
 
         $elementVisibilityMock = $this->getMockBuilder(ElementVisibilityInterface::class)
             ->getMockForAbstractClass();
-        $elementVisibilityMock->expects($this->once())
+        $elementVisibilityMock->expects($this->any())
             ->method('isDisabled')
             ->willReturn($isDisabled);