diff --git a/MediaServiceCore b/MediaServiceCore
index 87c1826e1..147b03716 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 87c1826e1888042bcda112a50198a998359242d2
+Subproject commit 147b037168d74f3a5e65decad4519892142f01e7
diff --git a/SharedModules b/SharedModules
index 157ddcf38..aa4cfca0d 160000
--- a/SharedModules
+++ b/SharedModules
@@ -1 +1 @@
-Subproject commit 157ddcf38dc9638cbee1b0350034cb73f649c3c1
+Subproject commit aa4cfca0db9d9c8f7cabf2c71a2a15f151c0e9ff
diff --git a/build.gradle b/build.gradle
index 0bba47b9c..a44e228f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,16 @@ apply from: gradle.ext.sharedModulesConstants
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    apply from: gradle.ext.sharedModulesConstants
+
     repositories {
         google()
         mavenCentral()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + kotlinVersion
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -25,8 +28,8 @@ allprojects {
     }
     configurations.all {
         // WorkManager conflict resolution
-        resolutionStrategy.force "androidx.lifecycle:lifecycle-livedata-core:" + liveDataVersion
-        resolutionStrategy.force "androidx.lifecycle:lifecycle-livedata:" + liveDataVersion
-        resolutionStrategy.force "androidx.lifecycle:lifecycle-runtime:" + liveDataVersion
+        resolutionStrategy.force 'androidx.lifecycle:lifecycle-livedata-core:' + liveDataVersion
+        resolutionStrategy.force 'androidx.lifecycle:lifecycle-livedata:' + liveDataVersion
+        resolutionStrategy.force 'androidx.lifecycle:lifecycle-runtime:' + liveDataVersion
     }
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7650447ae..f75a4253e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip