diff --git a/common b/common
index a68f49563..f005147a7 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a68f495634dea8d237ce9444d9166c89d6f7ff1e
+Subproject commit f005147a7d82ec5b3de1e5c673cd7fd965b431a3
diff --git a/gradle.properties b/gradle.properties
index 329e4c773..9da7fae4d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,7 @@ android.enableJetifier=true
 # https://office.visualstudio.com/Outlook%20Mobile/_wiki/wikis/Outlook-Mobile.wiki/3780/Android-Studio-Gradle-Performance-tips-and-tricks
 org.gradle.parallel=true
 org.gradle.daemon=true
+org.gradle.configureondemand=true
 
 # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted
 # we must make sure that the total size is <7G, as that's the RAM size of VM on the build pipeline.