Merge remote-tracking branch 'origin/master' into development

# Conflicts:
#	app/googlePlayFlavor/release/output-metadata.json

app/googlePlayFlavor/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 100,
-      "versionName": "1.6.24-googlePlay",
+      "versionCode": 101,
+      "versionName": "1.6.25-googlePlay",
       "outputFile": "app-googlePlayFlavor-release.apk"
     }
   ]

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/metadata/android/en-US/changelogs/101.txt

@@ -0,0 +1 @@
+Fixed bug that crashed the app when saving rules while the service was running.