diff --git a/gradle.properties b/gradle.properties
index d53b5011ba42..dc9b55bc9db0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,11 +3,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 org.gradle.parallel=true
-org.gradle.daemon=true
 org.gradle.configureondemand=true
 # Be careful when changing org.gradle.jvmargs below. It will clobber
 # any defaults set by Gradle: https://github.com/gradle/gradle/issues/19750
-org.gradle.jvmargs=-Xmx8g -Xms2g -XX:MaxMetaspaceSize=6g
+# Temporary workaround: all projects must use identical JVM arguments in gradle.properties to enable daemon sharing.
+# Do not modify these values without first reviewing Bug 1954747: https://bugzilla.mozilla.org/show_bug.cgi?id=1954747
+org.gradle.jvmargs=-Xmx7g -Xms2g -XX:MaxMetaspaceSize=6g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
+org.gradle.daemon=true
 
 org.gradle.configuration-cache=true
 
diff --git a/mobile/android/android-components/gradle.properties b/mobile/android/android-components/gradle.properties
index 49971965989a..0d5682c7725b 100644
--- a/mobile/android/android-components/gradle.properties
+++ b/mobile/android/android-components/gradle.properties
@@ -13,6 +13,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+# Temporary workaround: all projects must use identical JVM arguments in gradle.properties to enable daemon sharing.
+# Do not modify these values without first reviewing Bug 1954747: https://bugzilla.mozilla.org/show_bug.cgi?id=1954747
 org.gradle.jvmargs=-Xmx7g -Xms2g -XX:MaxMetaspaceSize=6g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
 org.gradle.daemon=true
 
diff --git a/mobile/android/fenix/gradle.properties b/mobile/android/fenix/gradle.properties
index f67e680452ca..bc446b5639f9 100644
--- a/mobile/android/fenix/gradle.properties
+++ b/mobile/android/fenix/gradle.properties
@@ -10,6 +10,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+# Temporary workaround: all projects must use identical JVM arguments in gradle.properties to enable daemon sharing.
+# Do not modify these values without first reviewing Bug 1954747: https://bugzilla.mozilla.org/show_bug.cgi?id=1954747
 org.gradle.jvmargs=-Xmx7g -Xms2g -XX:MaxMetaspaceSize=6g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
 org.gradle.configureondemand=true
 
diff --git a/mobile/android/focus-android/gradle.properties b/mobile/android/focus-android/gradle.properties
index 75a2b73f65be..a39d28058d28 100644
--- a/mobile/android/focus-android/gradle.properties
+++ b/mobile/android/focus-android/gradle.properties
@@ -13,9 +13,11 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-android.useAndroidX=true
+# Temporary workaround: all projects must use identical JVM arguments in gradle.properties to enable daemon sharing.
+# Do not modify these values without first reviewing Bug 1954747: https://bugzilla.mozilla.org/show_bug.cgi?id=1954747
 org.gradle.jvmargs=-Xmx7g -Xms2g -XX:MaxMetaspaceSize=6g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
 org.gradle.configureondemand=true
+android.useAndroidX=true
 
 org.gradle.configuration-cache=true