From bcc45269c187cdafb144dc1c2e40b78be6050fc8 Mon Sep 17 00:00:00 2001
From: Yuriy <yvechirko@magecom.net>
Date: Tue, 2 Apr 2019 16:13:58 +0300
Subject: [PATCH 1/2] Previous scrolling to invalid form element is not being
 canceled on hitting submit multiple times #21715

---
 lib/web/mage/validation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index cd3d3bea4eabf..8c19669699b9d 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1948,7 +1948,7 @@
             }
 
             if (firstActive.length) {
-                $('html, body').animate({
+                $('html, body').stop().animate({
                     scrollTop: firstActive.offset().top
                 });
                 firstActive.focus();

From bd0613a10f5bdfc554361c39b7b43072f3395868 Mon Sep 17 00:00:00 2001
From: Keyur Kanani <keyurk@emiprotechnologies.com>
Date: Wed, 24 Apr 2019 12:21:11 +0530
Subject: [PATCH 2/2] Fixed Dependency on Backup Settings Configuration

---
 app/code/Magento/Backup/etc/adminhtml/system.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Backup/etc/adminhtml/system.xml b/app/code/Magento/Backup/etc/adminhtml/system.xml
index 90f6fa861b40f..aa6635b4dde4a 100644
--- a/app/code/Magento/Backup/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/system.xml
@@ -26,6 +26,7 @@
                     <label>Scheduled Backup Type</label>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                     <source_model>Magento\Backup\Model\Config\Source\Type</source_model>
                 </field>
@@ -33,12 +34,14 @@
                     <label>Start Time</label>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                 </field>
                 <field id="frequency" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Frequency</label>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                     <source_model>Magento\Cron\Model\Config\Source\Frequency</source_model>
                     <backend_model>Magento\Backup\Model\Config\Backend\Cron</backend_model>
@@ -48,6 +51,7 @@
                     <comment>Please put your store into maintenance mode during backup.</comment>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>