diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 422a63e22b..8f183cbc9b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,11 +10,12 @@
 ## Product Description
 <!-- For non-invisible changes, describe user-facing effects. Would be good to add screenshots/videos for any major user facing changes -->
 
-## Safety Assurance
+## PR Checklist
 
-- [ ] If the PR is high risk, "High Risk" label is set
+- [ ] If I think the PR is high risk, "High Risk" label is set
 - [ ] I have confidence that this PR will not introduce a regression for the reasons below
 - [ ] Do we need to enhance manual QA test coverage ? If yes, "QA Note" label is set correctly
+- [ ] Does the PR introduce any major changes worth communicating ? If yes, "Release Note" label is set and a "Release Note" is specified in PR description.
 
 ### Automated test coverage
 
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 56973f2aa9..29703ce577 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -21,6 +21,14 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Get changed files
+        id: files
+        uses: octokit/request-action@v2.4.0
+        with:
+          route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Lint Code Base
         uses: super-linter/super-linter@v5
         env:
@@ -29,3 +37,5 @@ jobs:
           IGNORE_GITIGNORED_FILES: true
           VALIDATE_JSCPD: false
           JAVA_FILE_NAME: checkstyle.xml
+        with:
+          changed_files: ${{ steps.files.outputs.files }}
diff --git a/README.md b/README.md
index 02e2bafd99..7015b20623 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,12 @@ CommCare is an easily customizable, open source mobile platform that supports fr
 
 This repository represents the Android version of CommCare. It depends on the [CommCare Core](https://github.com/dimagi/commcare-core) repository, which contains the XForm engine and case/lookup table implementations.
 
+## End-to-End Development
+
+CommCare Android is a mobile CommCare Platform client runtime, and requires a backend environment for full end-to-end usage and to test platform development.
+
+If you don't have an access to another backend, or if you will be doing full platform development, after completing this setup you can follow [the end-to-end development guide](https://github.com/dimagi/commcare-hq/blob/master/local_dev_guide.rst) which explains how to establish a local environment for CommCare's full client/server software. 
+
 ## Setup
 
 To set up an Android dev environment for commcare-android, do the following:
@@ -34,7 +40,6 @@ git clone https://github.com/dimagi/commcare-core.git
 - Click "OK" to use the Gradle wrapper
 - Wait while Android Studio spins its wheels
 - Download any build dependencies that the SDK Manager tells you you need.
-- Disable _Instant Run_ found in Settings > Build, Execution, Deployment > Instant Run. (It does not play well with multidexing, which we have enabled, or with some of the processes we have set up for Google Services)
 
 ## Building
 
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 027dcf5a22..12ce003758 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.commcare.dalvik"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           android:versionCode="106"
-          android:versionName="2.54">
+          android:versionName="2.56">
 
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -17,18 +16,28 @@
         android:name="android.permission.INTERNET"/>
     <uses-permission
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"/>
     <uses-permission android:name="android.permission.CALL_PHONE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <!-- required to ensure app compatibility -->
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
+        android:usesPermissionFlags="neverForLocation"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <uses-feature
         android:name="android.hardware.telephony"
@@ -48,7 +57,7 @@
 
     <uses-sdk tools:overrideLibrary="com.dimagi.android.zebraprinttool, com.simprints.libsimprints,
     ru.noties.markwon.il, ru.noties.markwon.view, ru.noties.markwon.renderer,
-    com.google.firebase.crashlytics, com.google.firebase.iid"/>
+    com.google.firebase.crashlytics, com.google.firebase.iid, com.appmattus.certificatetransparency"/>
 
     <permission-group
         android:name="commcare.permission-group.DATABASE"
@@ -94,6 +103,11 @@
         <package android:name="org.commcare.dalvik.reminders" />
         <package android:name="callout.commcare.org.sendussd" />
         <package android:name="org.commcare.dalvik.abha" />
+        <package android:name="com.dimagi.biometric" />
+        <package android:name="org.rdtoolkit" />
+        <package android:name="richard.chard.lu.android.areamapper" />
+        <package android:name="org.commcare.respiratory" />
+        <package android:name="com.simprints.id" />
     </queries>
 
     <application
@@ -105,7 +119,8 @@
         android:label="@string/application_name"
         android:hardwareAccelerated="true"
         android:usesCleartextTraffic="true"
-        android:theme="@style/AppBaseTheme">
+        android:theme="@style/AppBaseTheme"
+        android:enableOnBackInvokedCallback="false">
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
@@ -121,7 +136,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="${applicationId}.action.CommCareSession"/>
+                <action android:name="org.commcare.dalvik.action.CommCareSession"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
@@ -186,6 +201,10 @@
             android:name="org.commcare.activities.SessionAwarePreferenceActivity"
             android:theme="@style/PreferenceTheme">
         </activity>
+        <activity
+            android:name="org.commcare.activities.FullscreenVideoViewActivity"
+            android:theme="@style/FullscreenTheme">
+        </activity>
         <activity
             android:exported="false"
             android:name="org.commcare.activities.DotsEntryActivity">
@@ -285,12 +304,14 @@
             android:name="org.commcare.activities.FormRecordListActivity"
             android:windowSoftInputMode="adjustResize">
         </activity>
-
         <service
             android:enabled="true"
+            android:foregroundServiceType="specialUse"
             android:name="org.commcare.services.CommCareSessionService">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Service that maintains an encryption key in memory to securely submit data to the server" />
         </service>
-
         <activity
             android:launchMode="singleTop"
             android:name="org.commcare.activities.FormEntryActivity"
@@ -320,14 +341,12 @@
         <activity android:name="org.commcare.gis.EntityMapActivity">
         </activity>
 
-        <activity android:name="org.commcare.gis.EntityMapboxActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        <activity android:name="org.commcare.gis.EntityMapboxActivity">
         </activity>
 
         <activity
             android:name="org.commcare.gis.DrawingBoundaryActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:exported="false">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.action.DrawBoundary"/>
 
@@ -343,8 +362,7 @@
         </activity>
         <activity android:name="org.commcare.activities.InstallFromListActivity">
         </activity>
-        <activity android:name="org.commcare.gis.MapboxLocationPickerActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity android:name="org.commcare.gis.MapboxLocationPickerActivity" />
 
         <uses-library
             android:name="com.google.android.maps"
@@ -353,7 +371,9 @@
         <activity android:name="org.commcare.activities.MessageActivity">
         </activity>
 
-        <receiver android:name="org.commcare.views.notifications.NotificationClearReceiver">
+        <receiver
+            android:exported="false"
+            android:name="org.commcare.views.notifications.NotificationClearReceiver">
         </receiver>
 
         <activity
@@ -541,6 +561,7 @@
             Below code removes this receiver's entry from Manifest.
          -->
         <receiver android:name="io.ona.kujaku.receivers.KujakuNetworkChangeReceiver"
+            android:exported="false"
             tools:node="remove"/>
 
         <!-- The zebra-print-android library is not yet targeting Android 12 and at least one
diff --git a/app/assets/locales/android_translatable_strings.txt b/app/assets/locales/android_translatable_strings.txt
index d710245070..46735f4bf1 100644
--- a/app/assets/locales/android_translatable_strings.txt
+++ b/app/assets/locales/android_translatable_strings.txt
@@ -2,6 +2,7 @@ option.yes=YES
 option.no=NO
 option.cancel=CANCEL
 dialog.ok=OK
+dialog.do.not.show=Don't show again
 
 updates.found=Updates found! Downloading new resource ${0} done of ${1}
 updates.success=App is up to date
@@ -166,7 +167,9 @@ form.entry.incomplete.save.success=Form saved as incomplete
 form.entry.save.error=Sorry, form save failed. Please contact CommCare Support to look into the issue.
 form.entry.save.invalid.unicode=Could not save '${0}' text in form.
 form.entry.finish.button=FINISH
+form.entry.exit.button=EXIT
 form.entry.restart.after.expiration=You were logged out due to session expiration. The form you were in the middle of has been saved and resumed.
+form.entry.restart.after.session.pause=CommCare was closed and the form you were in the middle of has been saved and resumed.
 
 login.attempt.badcred=Username or password are incorrect. Please try again.
 
@@ -443,20 +446,24 @@ custom.restore.file.not.set=Custom restore file path is not set in preferences
 custom.restore.error=Error loading custom sync
 
 start.recording=Start Recording
+start.recording.failed=Unable to start recording while another application is using the microphone!
 stop.recording=Stop Recording
 recording.header=Record a sound
 before.recording=Tap to start recording
 before.overwrite.recording=Tap to start a new recording
-during.recording=Tap to stop recording
+during.recording=Recording is in progress, avoid navigating away from CommCare. Tap to stop recording
 after.recording=Recording complete.
 delete.recording=Tap to delete recording
 pause.recording=Recording paused, tap to continue recording
+pause.recording.because.no.sound.captured=Recording paused because another app started recording, tap to continue recording
 save=Save
 recording.cancel=Cancel
 recording.clear=Clear
 recording.prompt.with.file.chooser=Record or choose sound below
 recording.prompt.without.file.chooser=Record sound below
 recording.custom=Recorded Sound
+recording.paused.due.another.app.recording.title=CommCare Audio Recording
+recording.paused.due.another.app.recording.message=Recording paused as another app started recording. Click here to resume the recording!
 
 callout.failure.dialer=Device is not currently configured to make telephone calls
 callout.failure.sms=SMS app not found
@@ -814,6 +821,9 @@ wifi.direct.status.receive.message=This will allow you to receive forms on this
 wifi.direct.status.submit.header=You are in Submit Form Mode
 wifi.direct.status.submit.count=Device has ${0} unsubmitted forms.
 wifi.direct.status.submit.message=This mode will allow you to submit forms to the CommCare Server if you have an internet connection.
+wifi.direct.permission.nearby.wifi.title=Permission to access nearby Wi-Fi Devices
+wifi.direct.permission.nearby.wifi.message=In order to exchange data with nearby devices via Wi-Fi, CommCare needs access to Wi-Fi capabilities.
+wifi.direct.permission.nearby.wifi.denial=CommCare doesn't have permission to connect with nearby devices via Wi-Fi. Please enable via Android's settings.
 
 form.transfer.no.forms=No forms to send.
 
@@ -830,11 +840,13 @@ image.capture.not.saved=The image you have taken was not able to be saved proper
 image.selection.not.saved=The image you have chosen was not able to be saved properly. Please select another image.
 image.selection.invalid.extension=The image you have chosen doesn't have an extension. Please select another image.
 
+upload.clear.title=Clear
+
 odk_perfect_match_color=\#87D13E
 odk_fuzzy_match_color=\#FFE88F
 
 permission.all.title=CommCare Permissions
-permission.all.message=CommCare needs permissions to read/write forms to memory, call/message from the case list, and provide location data during form entry.
+permission.all.message=CommCare needs permissions to read/write forms to memory, call/message from the case list, provide location data during form entry and notify the user about important events.
 permission.all.denial.message=CommCare doesn't have the necessary permissions. Please enable via Android's settings.
 permission.case.callout.title=Permissions for calling & messaging
 permission.case.callout.message=CommCare needs call & messaging permissions to enable communication with cases.
@@ -864,6 +876,9 @@ intent.callout.unable.to.process=Unable to process callout result
 intent.callout.activity.missing=Couldn't find intent for callout!
 intent.callout.not.supported=This intent callout is not supported on this device
 fingerprints.scanned=Fingerprints scanned: ${0}
+intent.callout.biometrics.capture.result.success=All data stored successfully
+intent.callout.biometrics.capture.result.fail=No data was stored
+intent.callout.biometrics.capture.result.partialfail=Failed to store some data
 
 settings.developer.options=Developer Options
 settings.developer.title=Developer Options
@@ -883,8 +898,8 @@ repeat.dialog.go.back=Go Back
 repeat.dialog.leave=Do Not Add
 repeat.dialog.exit=Do Not Add. I'm Finished.
 repeat.dialog.add=Add Group
-repeat.dialog.add.another=Add another "${0}" group?
-repeat.dialog.add.new=Add a new "${0}" group?
+repeat.dialog.add.another=Add another ${0}?
+repeat.dialog.add.new=Add a new ${0}?
 lookup.table.missing.error=Unable to find lookup table "${0}". Make sure it exists and this user has access to it.
 
 ethiopian_months=Mäskäräm,T’ïk’ïmt,Hïdar,Tahsas,T’ïr,Yäkatit,Mägabit,Miyaziya,Gïnbot,Säne,Hämle,Nähäse,P’agume
@@ -967,6 +982,13 @@ tts.speak.failed=Couldn't speak now. Please try again!
 file.oversize.error.title=File Too Large
 file.oversize.error.message=Selected file exceeds the file size limit of 15 MB. Please select a file whose size is less than 15 MB.
 
+background.sync.pending.form.entry.title=Pending Sync
+background.sync.pending.form.entry.detail=There are new cases available but the Sync can't run while a form is open. A Sync will be triggered upon form submission!
+background.sync.logout.attempt.during.sync=Can't log out while a Sync is underway!
+background.sync.user.sync.attempt.during.sync=Can't trigger a Sync while another is underway!
+background.sync.form.entry.attempt.during.sync=A Form can't be open while a Sync is underway!
+background.sync.fail=Background sync failed. Please try to trigger a normal Sync
+
 android.package.name.org.commcare.dalvik.reminders=CommCare Reminders
 android.package.name.callout.commcare.org.sendussd=Commcare USSD
 android.package.name.org.commcare.dalvik.abha=CommCare ABHA
diff --git a/app/build.gradle b/app/build.gradle
index 74025938f5..a948b8989f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,4 @@
 import org.apache.tools.ant.filters.ReplaceTokens
-import com.android.builder.core.DefaultManifestParser
 
 ////////////
 // README //
@@ -22,7 +21,7 @@ repositories {
     flatDir {
         dirs 'libs'
     }
-    maven { url "https://jitpack.io" }
+    maven { url 'https://jitpack.io' }
 }
 
 configurations {
@@ -31,20 +30,19 @@ configurations {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation('org.robolectric:robolectric:4.8.2') {
         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')
     }
-    testImplementation 'org.robolectric:shadows-multidex:4.8.2'
     testImplementation 'androidx.test:core:1.5.0'
     testImplementation 'androidx.test:runner:1.5.2'
     testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'androidx.work:work-testing:2.7.1'
     testImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.2"
-    testImplementation "io.mockk:mockk:1.12.7"
-    testImplementation 'org.json:json:20140107'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+    testImplementation 'io.mockk:mockk:1.12.7'
+    testImplementation 'org.json:json:20231013'
     testImplementation project(path: ':commcare-core', configuration: 'testsAsJar')
 
     androidTestImplementation 'androidx.test:runner:1.4.0'
@@ -70,19 +68,22 @@ dependencies {
     implementation fileTree(include: '*.jar', exclude: 'regexp-me.jar', dir: 'libs')
     implementation(name: 'htmlspanner-custom', ext: 'aar')
     implementation 'com.github.dimagi:zebra-print-android:v1.3'
-    implementation 'com.simprints:LibSimprints:1.0.12'
+    implementation (name: 'LibSimprints-1.0.12', ext: 'aar')
+    implementation (name: 'mapbox-android-accounts-0.2.0', ext: 'aar')
+    implementation (name: 'realm-android-library-4.1.1', ext: 'aar')
+    implementation (name: 'volley-1.1.0', ext: 'aar')
+    implementation (name: 'storage-2.1.0', ext: 'aar')
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.72'
-    implementation 'com.google.android.gms:play-services-maps:17.0.0'
+    implementation 'com.google.android.gms:play-services-maps:19.0.0'
     implementation 'joda-time:joda-time:2.9.4'
     implementation 'net.zetetic:android-database-sqlcipher:4.5.3@aar'
-    implementation "androidx.sqlite:sqlite:2.2.0"
+    implementation 'androidx.sqlite:sqlite:2.2.0'
     implementation('org.apache.james:apache-mime4j:0.7.2') {
         exclude module: 'commons-io'
     }
@@ -91,10 +92,6 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.scottyab:rootbeer-lib:0.1.0'
 
-    // crashes on update - https://developers.google.com/admob/android/quick-start#update_your_androidmanifestxml
-    // We need to update consumer apps script to inject the right admob id to be able to update this
-    implementation 'com.google.firebase:firebase-ads:16.0.1'
-
     implementation 'com.carrotsearch:hppc:0.9.1'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
@@ -103,108 +100,109 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging:21.1.0'
     implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-    implementation 'com.duolingo.open:rtl-viewpager:2.0.0'
-    implementation ("com.github.bumptech.glide:glide:4.9.0") {
-        exclude group: "com.android.support"
+    implementation (name: 'rtl-viewpager-2.0.0', ext: 'aar')
+    implementation('com.github.bumptech.glide:glide:4.9.0') {
+        exclude group: 'com.android.support'
     }
 
+    implementation 'com.getkeepsafe.relinker:relinker:1.4.4'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
 
     // Markdown
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:ext-tables:$markwon_version"
     implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
 
-    implementation ('io.ona.kujaku:library:0.9.0'){
+    implementation('io.ona.kujaku:library:0.9.0') {
         exclude module: 'xpp3'
+        exclude module: 'volley'
+        exclude module: 'storage'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'io.realm'
     }
-    implementation "androidx.work:work-runtime:2.7.1"
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
+    implementation 'androidx.work:work-runtime:2.10.0'
+    implementation 'androidx.work:work-runtime-ktx:2.10.0'
 
-    implementation 'com.google.android.play:core:1.10.3'
+    implementation 'com.google.android.play:app-update:2.1.0'
     implementation 'android.arch.lifecycle:common-java8:1.1.1'
 
-    implementation('com.squareup.okhttp3:okhttp-tls:3.12.12') {
+
+    implementation('com.squareup.okhttp3:okhttp-tls:4.11.0') {
         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')
     }
 
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'com.google.guava:guava:31.1-jre'
+
+    implementation 'com.appmattus.certificatetransparency:certificatetransparency-android:2.5.4'
+
+    // Dependency required for API desugaring
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_minimal:2.1.3'
 }
 
 ext {
     // Obtained from ~/.gradle/gradle.properties on build server (mobile agent), or your local
     // Obtained from ~/.gradle/gradle.properties on build server (mobile agent), or your local
     // ~/.gradle/gradle.properties file, or loads default empty strings if neither is present
-    MAPBOX_SDK_API_KEY = project.properties['MAPBOX_SDK_API_KEY'] ?: ""
-    ANALYTICS_TRACKING_ID_DEV = project.properties['ANALYTICS_TRACKING_ID_DEV'] ?: ""
-    ANALYTICS_TRACKING_ID_LIVE = project.properties['ANALYTICS_TRACKING_ID_LIVE'] ?: ""
-    GOOGLE_PLAY_MAPS_API_KEY = project.properties['GOOGLE_PLAY_MAPS_API_KEY'] ?: ""
-    RELEASE_STORE_FILE = project.properties['RELEASE_STORE_FILE'] ?: "."
-    RELEASE_STORE_PASSWORD = project.properties['RELEASE_STORE_PASSWORD'] ?: ""
-    RELEASE_KEY_ALIAS = project.properties['RELEASE_KEY_ALIAS'] ?: ""
-    RELEASE_KEY_PASSWORD = project.properties['RELEASE_KEY_PASSWORD'] ?: ""
+    MAPBOX_SDK_API_KEY = project.properties['MAPBOX_SDK_API_KEY'] ?: ''
+    ANALYTICS_TRACKING_ID_DEV = project.properties['ANALYTICS_TRACKING_ID_DEV'] ?: ''
+    ANALYTICS_TRACKING_ID_LIVE = project.properties['ANALYTICS_TRACKING_ID_LIVE'] ?: ''
+    GOOGLE_PLAY_MAPS_API_KEY = project.properties['GOOGLE_PLAY_MAPS_API_KEY'] ?: ''
+    RELEASE_STORE_FILE = project.properties['RELEASE_STORE_FILE'] ?: '.'
+    RELEASE_STORE_PASSWORD = project.properties['RELEASE_STORE_PASSWORD'] ?: ''
+    RELEASE_KEY_ALIAS = project.properties['RELEASE_KEY_ALIAS'] ?: ''
+    RELEASE_KEY_PASSWORD = project.properties['RELEASE_KEY_PASSWORD'] ?: ''
     TRUSTED_SOURCE_PUBLIC_KEY = project.properties['TRUSTED_SOURCE_PUBLIC_KEY'] ?:
-            "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHiuy2ULV4pobkuQN2TEjmR1tn" +
-                    "HJ+F335hm/lVdaFQzvBmeq64MUMbumheVLDJaSUiAVzqSHDKJWH01ZQRowqBYjwo" +
-                    "ycVSQSeO2glc6XZZ+CJudAPXe8iFWLQp3kBBnBmVcBXCOQFO7aLgQMv4nqKZsLW0" +
-                    "HaAJkjpnc165Os+aYwIDAQAB"
-    GOOGLE_SERVICES_API_KEY = project.properties['GOOGLE_SERVICES_API_KEY'] ?: ""
-    QA_BETA_APP_ID = ""
-    STANDALONE_APP_ID = ""
-    LTS_APP_ID = ""
-    COMMCARE_APP_ID = ""
-    HQ_API_USERNAME = project.properties['HQ_API_USERNAME'] ?: ""
-    HQ_API_PASSWORD = project.properties['HQ_API_PASSWORD'] ?: ""
-    TEST_BUILD_TYPE = project.properties['TEST_BUILD_TYPE'] ?: "debug"
+            'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHiuy2ULV4pobkuQN2TEjmR1tn' +
+                    'HJ+F335hm/lVdaFQzvBmeq64MUMbumheVLDJaSUiAVzqSHDKJWH01ZQRowqBYjwo' +
+                    'ycVSQSeO2glc6XZZ+CJudAPXe8iFWLQp3kBBnBmVcBXCOQFO7aLgQMv4nqKZsLW0' +
+                    'HaAJkjpnc165Os+aYwIDAQAB'
+    GOOGLE_SERVICES_API_KEY = project.properties['GOOGLE_SERVICES_API_KEY'] ?: ''
+    QA_BETA_APP_ID = ''
+    STANDALONE_APP_ID = ''
+    LTS_APP_ID = ''
+    COMMCARE_APP_ID = ''
+    HQ_API_USERNAME = project.properties['HQ_API_USERNAME'] ?: ''
+    HQ_API_PASSWORD = project.properties['HQ_API_PASSWORD'] ?: ''
+    TEST_BUILD_TYPE = project.properties['TEST_BUILD_TYPE'] ?: 'debug'
+    FIREBASE_DATABASE_URL = project.properties['FIREBASE_DATABASE_URL'] ?: ''
 }
 
 afterEvaluate {
     // Hack to get assets to show up in robolectric tests; try to eventually remove this
     preCommcareDebugUnitTestBuild.dependsOn mergeCommcareDebugAssets
-    processStandaloneDebugGoogleServices.dependsOn injectGoogleServicesAPIKey
-    processStandaloneReleaseGoogleServices.dependsOn injectGoogleServicesAPIKey
-    processLtsDebugGoogleServices.dependsOn injectGoogleServicesAPIKey
-    processLtsReleaseGoogleServices.dependsOn injectGoogleServicesAPIKey
-    processCommcareDebugGoogleServices.dependsOn injectGoogleServicesAPIKey
-    processCommcareReleaseGoogleServices.dependsOn injectGoogleServicesAPIKey
+    processStandaloneDebugGoogleServices.dependsOn injectPropertiesIntoFirebaseConfigFile
+    processStandaloneReleaseGoogleServices.dependsOn injectPropertiesIntoFirebaseConfigFile
+    processLtsDebugGoogleServices.dependsOn injectPropertiesIntoFirebaseConfigFile
+    processLtsReleaseGoogleServices.dependsOn injectPropertiesIntoFirebaseConfigFile
+    processCommcareDebugGoogleServices.dependsOn injectPropertiesIntoFirebaseConfigFile
+    processCommcareReleaseGoogleServices.dependsOn injectPropertiesIntoFirebaseConfigFile
 }
 
 /**
  * https://discuss.gradle.org/t/gradle-7-0-seems-to-take-an-overzealous-approach-to-inter-task-dependencies/39656/2
  * Gradle 7.0 treats any copy tasks as having an implicit dependencies with each other.
  */
-task injectGoogleServicesAPIKey {
-    description = 'Injects the Google Services API key into the google-services.json file at runtime'
+tasks.register('injectPropertiesIntoFirebaseConfigFile') {
+    description = 'Injects properties into the google-services.json file at runtime'
 
     copy {
         from 'templates/google-services.json'
-        filter(ReplaceTokens, tokens: [apiKey: project.ext.GOOGLE_SERVICES_API_KEY])
+        filter(ReplaceTokens, tokens: [apiKey: project.ext.GOOGLE_SERVICES_API_KEY,
+                                       firebaseDatabaseUrl: project.ext.FIREBASE_DATABASE_URL])
         into projectDir
     }
 }
 
-def ccAppId = project.hasProperty('cc_app_id') ? cc_app_id : ""
-def ccDomain = project.hasProperty('cc_domain') ? cc_domain : ""
-def isConsumerApp = project.hasProperty('is_consumer_app') ? is_consumer_app : "false"
-def runDownloadScripts = project.hasProperty('run_download_scripts') ? run_download_scripts : "true"
-def ccDomainSafe = ccDomain.replaceAll("-", "")
+def ccAppId = project.hasProperty('cc_app_id') ? cc_app_id : ''
+def ccDomain = project.hasProperty('cc_domain') ? cc_domain : ''
+def isConsumerApp = project.hasProperty('is_consumer_app') ? is_consumer_app : 'false'
+def runDownloadScripts = project.hasProperty('run_download_scripts') ? run_download_scripts : 'true'
+def ccDomainSafe = ccDomain.replaceAll('-', '')
 def consumerAppUsername = getConsumerAppUsername(isConsumerApp)
 def consumerAppPassword = getConsumerAppPassword(isConsumerApp)
-def usingAdmob = isConsumerApp && project.hasProperty('admob_id') && allAdUnitIdsPresent()
-def admobId = usingAdmob ? admob_id : ""
-def entityDetailAdUnitId = usingAdmob ? entity_detail_ad_id : ""
-def entitySelectAdUnitId = usingAdmob ? entity_select_ad_id : ""
-def menuListAdUnitId = usingAdmob ? menu_list_ad_id : ""
-def menuGridAdUnitId = usingAdmob ? menu_grid_ad_id : ""
-
-def allAdUnitIdsPresent() {
-    return (project.hasProperty("entity_detail_ad_id") &&
-            project.hasProperty("entity_select_ad_id") &&
-            project.hasProperty("menu_list_ad_id") &&
-            project.hasProperty("menu_grid_ad_id"))
-}
 
 /**
  * Get the version code from command line param
@@ -224,12 +222,13 @@ static def getDate() {
 }
 
 android {
-    compileSdkVersion 31
+    namespace 'org.commcare.dalvik'
+    compileSdk 35
 
     lintOptions {
         abortOnError false
         disable 'MissingTranslation'
-        disable "ResourceType"
+        disable 'ResourceType'
     }
 
     // Espresso requires us to disable animations on device.
@@ -245,18 +244,22 @@ android {
         exclude 'META-INF/NOTICE.txt'
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
-        multiDexEnabled true
-        applicationId "org.commcare.dalvik"
-        testNamespace "org.commcare.dalvik.test"
+        targetSdkVersion 34
+
+        applicationId 'org.commcare.dalvik'
+        testNamespace 'org.commcare.dalvik.test'
 
         project.ext.COMMCARE_APP_ID = applicationId
         // set the app name
-        def applicationName = "CommCare"
-        resValue "string", "application_name", applicationName
-        def odkProviderStr = "org.commcare.android.provider.odk"
+        def applicationName = 'CommCare'
+        resValue 'string', 'application_name', applicationName
+        def odkProviderStr = 'org.commcare.android.provider.odk'
         manifestPlaceholders = [
                 odkProvider         : odkProviderStr,
                 googlePlayMapsApiKey: "${project.ext.GOOGLE_PLAY_MAPS_API_KEY}"
@@ -266,31 +269,26 @@ android {
 
         // when set, app won't show install screen and try to install
         // resources from assets folder
-        buildConfigField "boolean", "IS_SINGLE_APP_BUILD", "false"
-        buildConfigField "boolean", "IS_CONSUMER_APP", "false"
-        buildConfigField "String", "CONSUMER_APP_USERNAME", "\"\""
-        buildConfigField "String", "CONSUMER_APP_PASSWORD", "\"\""
+        buildConfigField 'boolean', 'IS_SINGLE_APP_BUILD', 'false'
+        buildConfigField 'boolean', 'IS_CONSUMER_APP', 'false'
+        buildConfigField 'String', 'CONSUMER_APP_USERNAME', "\"\""
+        buildConfigField 'String', 'CONSUMER_APP_PASSWORD', "\"\""
 
-        buildConfigField "String", "CC_AUTHORITY", "\"${applicationId}\""
-        buildConfigField "String", "ODK_AUTHORITY", "\"${odkProviderStr}\""
+        buildConfigField 'String', 'CC_AUTHORITY', "\"${applicationId}\""
+        buildConfigField 'String', 'ODK_AUTHORITY', "\"${odkProviderStr}\""
 
-        buildConfigField "String", "BUILD_DATE", "\"" + getDate() + "\""
-        buildConfigField "String", "BUILD_NUMBER", "\"" + computeVersionCode() + "\""
-        buildConfigField "String", "TRUSTED_SOURCE_PUBLIC_KEY", "\"${project.ext.TRUSTED_SOURCE_PUBLIC_KEY}\""
-        buildConfigField "String", "ANALYTICS_TRACKING_ID_LIVE", "\"${project.ext.ANALYTICS_TRACKING_ID_LIVE}\""
-        buildConfigField "String", "ANALYTICS_TRACKING_ID_DEV", "\"${project.ext.ANALYTICS_TRACKING_ID_DEV}\""
-        buildConfigField "String", "MAPBOX_SDK_API_KEY", "\"${project.ext.MAPBOX_SDK_API_KEY}\""
+        buildConfigField 'String', 'BUILD_DATE', "\"" + getDate() + "\""
+        buildConfigField 'String', 'BUILD_NUMBER', "\"" + computeVersionCode() + "\""
+        buildConfigField 'String', 'TRUSTED_SOURCE_PUBLIC_KEY', "\"${project.ext.TRUSTED_SOURCE_PUBLIC_KEY}\""
+        buildConfigField 'String', 'ANALYTICS_TRACKING_ID_LIVE', "\"${project.ext.ANALYTICS_TRACKING_ID_LIVE}\""
+        buildConfigField 'String', 'ANALYTICS_TRACKING_ID_DEV', "\"${project.ext.ANALYTICS_TRACKING_ID_DEV}\""
+        buildConfigField 'String', 'MAPBOX_SDK_API_KEY', "\"${project.ext.MAPBOX_SDK_API_KEY}\""
 
-        buildConfigField "String", "ADMOB_ID", "\"\""
-        buildConfigField "String", "ENTITY_DETAIL_AD_UNIT_ID", "\"\""
-        buildConfigField "String", "ENTITY_SELECT_AD_UNIT_ID", "\"\""
-        buildConfigField "String", "MENU_LIST_AD_UNIT_ID", "\"\""
-        buildConfigField "String", "MENU_GRID_AD_UNIT_ID", "\"\""
+        buildConfigField "String", "FIREBASE_DATABASE_URL", "\"${project.ext.FIREBASE_DATABASE_URL}\""
 
-        buildConfigField "String", "HQ_API_USERNAME", "\"${project.ext.HQ_API_USERNAME}\""
-        buildConfigField "String", "HQ_API_PASSWORD", "\"${project.ext.HQ_API_PASSWORD}\""
+        buildConfigField 'String', 'CCC_HOST', "\"connect.dimagi.com\""
 
-        testInstrumentationRunner "org.commcare.CommCareJUnitRunner"
+        testInstrumentationRunner 'org.commcare.CommCareJUnitRunner'
     }
 
     buildFeatures {
@@ -298,7 +296,7 @@ android {
     }
 
     applicationVariants.all { variant ->
-        if (variant.buildType.name == "release") {
+        if (variant.buildType.name == 'release') {
             variant.outputs.each { output ->
                 output.versionCodeOverride = computeVersionCode()
             }
@@ -306,6 +304,9 @@ android {
     }
 
     compileOptions {
+        // Flag to enable support for API desugaring
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
@@ -345,6 +346,10 @@ android {
             manifest.srcFile 'CommcareAndroidManifest.xml'
         }
 
+        cccStaging {
+            manifest.srcFile 'CommcareAndroidManifest.xml'
+        }
+
         standalone {
             res.srcDirs = ['standalone/res']
             assets.srcDirs = ['standalone/assets']
@@ -372,7 +377,7 @@ android {
     }
 
     // Our flavours doesn't differ on a particular dimension yet, so just specify a dummy
-    flavorDimensions "dummy"
+    flavorDimensions 'dummy'
     productFlavors {
         commcare {
             // builds normal commcare
@@ -381,20 +386,29 @@ android {
 
         lts {
             // long term support build of CommCare
-            applicationId "org.commcare.lts"
+            applicationId 'org.commcare.lts'
             project.ext.LTS_APP_ID = applicationId
 
             // setup content provider strings correctly to not conflict with other apps
-            def odkProviderStr = "org.commcare.lts.provider.odk"
+            def odkProviderStr = 'org.commcare.lts.provider.odk'
             manifestPlaceholders = [odkProvider: odkProviderStr]
-            buildConfigField "String", "CC_AUTHORITY", "\"${applicationId}\""
-            buildConfigField "String", "ODK_AUTHORITY", "\"${odkProviderStr}\""
+            buildConfigField 'String', 'CC_AUTHORITY', "\"${applicationId}\""
+            buildConfigField 'String', 'ODK_AUTHORITY', "\"${odkProviderStr}\""
+
+            // set the app name
+            def applicationName = 'CommCare LTS'
+            resValue 'string', 'application_name', applicationName
+        }
+
+
+        cccStaging {
+            buildConfigField 'String', 'CCC_HOST', "\"connect-staging.dimagi.com\""
 
             // set the app name
-            def applicationName = "CommCare LTS"
-            resValue "string", "application_name", applicationName
+            def applicationName = 'CommCare (CCC Staging)'
+            resValue 'string', 'application_name', applicationName
         }
-        
+
         standalone {
             // Builds commcare w/ ccz app packaged in the apk.
             // Must be invoked from command-line w/ args pointing to app domain &
@@ -404,47 +418,41 @@ android {
 
             applicationId "org.commcare.${uniquePackageIdentifier}"
             project.ext.STANDALONE_APP_ID = applicationId
-            resValue "string", "application_name", appDisplayName
+            resValue 'string', 'application_name', appDisplayName
             def odkProviderStr = "org.commcare.${uniquePackageIdentifier}.provider.odk"
             manifestPlaceholders = [odkProvider: odkProviderStr]
 
-            buildConfigField "boolean", "IS_SINGLE_APP_BUILD", "true"
-            buildConfigField "boolean", "IS_CONSUMER_APP", isConsumerApp
-            buildConfigField "String", "CONSUMER_APP_USERNAME", "\"${consumerAppUsername}\""
-            buildConfigField "String", "CONSUMER_APP_PASSWORD", "\"${consumerAppPassword}\""
+            buildConfigField 'boolean', 'IS_SINGLE_APP_BUILD', 'true'
+            buildConfigField 'boolean', 'IS_CONSUMER_APP', isConsumerApp
+            buildConfigField 'String', 'CONSUMER_APP_USERNAME', "\"${consumerAppUsername}\""
+            buildConfigField 'String', 'CONSUMER_APP_PASSWORD', "\"${consumerAppPassword}\""
             // include this again so that the value get reloaded
-            buildConfigField "String", "CC_AUTHORITY", "\"${applicationId}\""
-            buildConfigField "String", "ODK_AUTHORITY", "\"${odkProviderStr}\""
-
-            buildConfigField "String", "ADMOB_ID", "\"${admobId}\""
-            buildConfigField "String", "ENTITY_DETAIL_AD_UNIT_ID", "\"${entityDetailAdUnitId}\""
-            buildConfigField "String", "ENTITY_SELECT_AD_UNIT_ID", "\"${entitySelectAdUnitId}\""
-            buildConfigField "String", "MENU_LIST_AD_UNIT_ID", "\"${menuListAdUnitId}\""
-            buildConfigField "String", "MENU_GRID_AD_UNIT_ID", "\"${menuGridAdUnitId}\""
+            buildConfigField 'String', 'CC_AUTHORITY', "\"${applicationId}\""
+            buildConfigField 'String', 'ODK_AUTHORITY', "\"${odkProviderStr}\""
         }
     }
 
     buildTypes {
         debug {
-            applicationIdSuffix ".debug"
-            def applicationId = "org.commcare.dalvik.debug"
+            applicationIdSuffix '.debug'
+            def applicationId = 'org.commcare.dalvik.debug'
             project.ext.COMMCARE_APP_ID = applicationId
-            def applicationName = "CommCare Debug"
-            resValue "string", "application_name", applicationName
-            def odkProviderStr = "org.commcare.dalvik.debug.provider.odk"
+            def applicationName = 'CommCare Debug'
+            resValue 'string', 'application_name', applicationName
+            def odkProviderStr = 'org.commcare.dalvik.debug.provider.odk'
             manifestPlaceholders = [odkProvider: odkProviderStr]
 
             minifyEnabled false
             debuggable true
 
             // used in test suite to build the prototype factory; otherwise unneeded
-            buildConfigField "String", "CC_AUTHORITY", "\"${applicationId}\""
-            buildConfigField "String", "ODK_AUTHORITY", "\"${odkProviderStr}\""
-            buildConfigField "String", "BUILD_DIR", fixEscaping("\"${buildDir}\"")
-            buildConfigField "String", "PROJECT_DIR", fixEscaping("\"${projectDir}\"")
+            buildConfigField 'String', 'CC_AUTHORITY', "\"${applicationId}\""
+            buildConfigField 'String', 'ODK_AUTHORITY', "\"${odkProviderStr}\""
+            buildConfigField 'String', 'BUILD_DIR', fixEscaping("\"${buildDir}\"")
+            buildConfigField 'String', 'PROJECT_DIR', fixEscaping("\"${projectDir}\"")
 
             // disable crashlytics
-            buildConfigField "boolean", "USE_CRASHLYTICS", "false"
+            buildConfigField 'boolean', 'USE_CRASHLYTICS', 'false'
             ext.enableCrashlytics = false
         }
 
@@ -452,10 +460,10 @@ android {
             minifyEnabled true
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+            testProguardFiles 'test-proguard.cfg'
 
-            multiDexKeepProguard file('proguard-multidex.pro')
             // enable crashlytics
-            buildConfigField "boolean", "USE_CRASHLYTICS", "true"
+            buildConfigField 'boolean', 'USE_CRASHLYTICS', 'true'
             ext.enableCrashlytics = true
         }
     }
@@ -485,7 +493,7 @@ android {
  * Download and unpack commcare app associated with 'cc_app_id' into assets
  * folder
  */
-task downloadCCApp(type: Exec)
+tasks.register('downloadCCApp', Exec)
 
 // task configuration phase
 downloadCCApp {
@@ -497,7 +505,7 @@ downloadCCApp {
 
     doLast {
         if (execResult.exitValue != 0) {
-            throw new GradleException("exec failed; see output above")
+            throw new GradleException('exec failed; see output above')
         }
     }
 }
@@ -505,17 +513,17 @@ downloadCCApp {
 // dynamic check at task execution time
 downloadCCApp {
     doLast {
-        if (ccAppId == "") {
-            throw new InvalidUserDataException("Please provide cc_app_id property (CommCare App ID) to be packaged with apk")
+        if (ccAppId == '') {
+            throw new InvalidUserDataException('Please provide cc_app_id property (CommCare App ID) to be packaged with apk')
         }
-        if (ccDomain == "") {
-            throw new InvalidUserDataException("Please provide cc_domain property (CommCare App Domain) to be packaged with apk")
+        if (ccDomain == '') {
+            throw new InvalidUserDataException('Please provide cc_domain property (CommCare App Domain) to be packaged with apk')
         }
     }
 }
 
 
-task downloadRestoreFile(type: Exec)
+tasks.register('downloadRestoreFile', Exec)
 
 // task configuration phase
 downloadRestoreFile {
@@ -527,7 +535,7 @@ downloadRestoreFile {
 
     doLast {
         if (execResult.exitValue != 0) {
-            throw new GradleException("exec failed; see output above")
+            throw new GradleException('exec failed; see output above')
         }
     }
 }
@@ -535,19 +543,19 @@ downloadRestoreFile {
 // dynamic check at task execution time
 downloadRestoreFile {
     doLast {
-        if (consumerAppUsername == "") {
-            throw new InvalidUserDataException("Please provide username for restore to be packaged with apk")
+        if (consumerAppUsername == '') {
+            throw new InvalidUserDataException('Please provide username for restore to be packaged with apk')
         }
-        if (consumerAppPassword == "") {
-            throw new InvalidUserDataException("Please provide password for restore to be packaged with apk")
+        if (consumerAppPassword == '') {
+            throw new InvalidUserDataException('Please provide password for restore to be packaged with apk')
         }
     }
 }
 
 // dynamically inject commcare app download into standalone build process
-tasks.whenTaskAdded { task ->
+tasks.configureEach { task ->
     if ((task.name == 'processStandaloneDebugResources' ||
-            task.name == 'processStandaloneReleaseResources') && "true" == runDownloadScripts) {
+            task.name == 'processStandaloneReleaseResources') && 'true' == runDownloadScripts) {
         task.dependsOn downloadCCApp
     }
     if ((task.name == 'processStandaloneDebugResources' ||
@@ -555,6 +563,10 @@ tasks.whenTaskAdded { task ->
             && "true" == isConsumerApp && "true" == runDownloadScripts) {
         task.dependsOn downloadRestoreFile
     }
+    if (task.name == 'assembleCommcareReleaseAndroidTest' || task.name == 'assembleCommcareDebugAndroidTest') {
+        android.defaultConfig.buildConfigField "String", "HQ_API_USERNAME", "\"${project.ext.HQ_API_USERNAME}\""
+        android.defaultConfig.buildConfigField "String", "HQ_API_PASSWORD", "\"${project.ext.HQ_API_PASSWORD}\""
+    }
 }
 
 /**
@@ -566,45 +578,45 @@ static def numbersToLetters(String version) {
     StringBuilder words = new StringBuilder()
     for (String num : chars) {
         switch (num) {
-            case "1": words.append("one"); break
-            case "2": words.append("two"); break
-            case "3": words.append("three"); break
-            case "4": words.append("four"); break
-            case "5": words.append("five"); break
-            case "6": words.append("six"); break
-            case "7": words.append("seven"); break
-            case "8": words.append("eight"); break
-            case "9": words.append("nine"); break
-            case "0": words.append("zero"); break
-            default: break // skip non-numeric
+            case '1': words.append('one'); break
+            case '2': words.append('two'); break
+            case '3': words.append('three'); break
+            case '4': words.append('four'); break
+            case '5': words.append('five'); break
+            case '6': words.append('six'); break
+            case '7': words.append('seven'); break
+            case '8': words.append('eight'); break
+            case '9': words.append('nine'); break
+            case '0': words.append('zero'); break
+            default: break // skip non-numeric'
         }
     }
     return words.toString()
 }
 
 static def fixEscaping(String s) {
-    return s.replaceAll("\\\\", "\\\\\\\\")
+    return s.replaceAll('\\\\', '\\\\\\\\')
 }
 
 def getStandalonePackageIdentifier(ccDomainSafe, isConsumerApp) {
     if (project.hasProperty('application_name')) {
-        return ccDomainSafe + "." + cleanseAppNameForPackageIdentifier(application_name)
-    } else if ("true" == isConsumerApp) {
-        throw new InvalidUserDataException("An application_name property must be provided for consumer app standalone builds")
+        return ccDomainSafe + '.' + cleanseAppNameForPackageIdentifier(application_name)
+    } else if ('true' == isConsumerApp) {
+        throw new InvalidUserDataException('An application_name property must be provided for consumer app standalone builds')
     } else {
         return ccDomainSafe
     }
 }
 
 static def cleanseAppNameForPackageIdentifier(appName) {
-    return appName.replaceAll("[ '.:]", "").replaceAll("\\\\", "").toLowerCase()
+    return appName.replaceAll("[ '.:]", "").replaceAll('\\\\', '').toLowerCase()
 }
 
 def getStandaloneApplicationName(ccDomainSafe, isConsumerApp) {
     if (project.hasProperty('application_name')) {
         return application_name
-    } else if ("true" == isConsumerApp) {
-        throw new InvalidUserDataException("An application_name property must be provided for consumer app standalone builds")
+    } else if ('true' == isConsumerApp) {
+        throw new InvalidUserDataException('An application_name property must be provided for consumer app standalone builds')
     } else {
         return ccDomainSafe
     }
@@ -613,20 +625,20 @@ def getStandaloneApplicationName(ccDomainSafe, isConsumerApp) {
 def getConsumerAppUsername(isConsumerApp) {
     if (project.hasProperty('username')) {
         return username
-    } else if ("true" == isConsumerApp) {
-        throw new InvalidUserDataException("A username property must be provided for consumer app standalone builds")
+    } else if ('true' == isConsumerApp) {
+        throw new InvalidUserDataException('A username property must be provided for consumer app standalone builds')
     } else {
-        return ""
+        return ''
     }
 }
 
 def getConsumerAppPassword(isConsumerApp) {
     if (project.hasProperty('password')) {
         return password
-    } else if ("true" == isConsumerApp) {
-        throw new InvalidUserDataException("A password property must be provided for consumer app standalone builds")
+    } else if ('true' == isConsumerApp) {
+        throw new InvalidUserDataException('A password property must be provided for consumer app standalone builds')
     } else {
-        return ""
+        return ''
     }
 }
 
diff --git a/app/instrumentation-tests/AndroidManifest.xml b/app/instrumentation-tests/AndroidManifest.xml
index fe2e5640d3..a05aaf4028 100644
--- a/app/instrumentation-tests/AndroidManifest.xml
+++ b/app/instrumentation-tests/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="${applicationId}">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator"/>
 
diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt b/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt
index ce675dfcbe..df5f161afb 100644
--- a/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt
+++ b/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt
@@ -10,7 +10,12 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.Intents.intending
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.commcare.annotations.BrowserstackTests
@@ -26,7 +31,7 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 @BrowserstackTests
-class AppPreferenceSettingsTest: BaseTest() {
+class AppPreferenceSettingsTest : BaseTest() {
 
     companion object {
         const val CCZ_NAME = "settings_sheet_tests.ccz"
@@ -44,13 +49,13 @@ class AppPreferenceSettingsTest: BaseTest() {
         val settingName = "Fuzzy Search Matches"
         InstrumentationUtility.openOptionsMenu()
         onView(withText("Settings"))
-                .perform(click())
+            .perform(click())
         selectSetting(settingName)
 
         onView(withText("Enabled"))
-                .check(matches(isDisplayed()))
+            .check(matches(isDisplayed()))
         onView(withText("Disabled"))
-                .check(matches(isDisplayed()))
+            .check(matches(isDisplayed()))
 
         // Check enabled is selected by default
         matchSelectedPreference("Enabled")
@@ -68,15 +73,15 @@ class AppPreferenceSettingsTest: BaseTest() {
         val settingName = "Auto Update Frequency"
         InstrumentationUtility.openOptionsMenu()
         onView(withText("Settings"))
-                .perform(click())
+            .perform(click())
         selectSetting(settingName)
 
         onView(withText("Never"))
-                .check(matches(isDisplayed()))
+            .check(matches(isDisplayed()))
         onView(withText("Daily"))
-                .check(matches(isDisplayed()))
+            .check(matches(isDisplayed()))
         onView(withText("Weekly"))
-                .check(matches(isDisplayed()))
+            .check(matches(isDisplayed()))
 
         // Change setting and check their persistence
         changePreferenceAndCheckPersistence("Daily", settingName)
@@ -91,7 +96,7 @@ class AppPreferenceSettingsTest: BaseTest() {
         InstrumentationUtility.login("settings.test.3", "123")
         InstrumentationUtility.openOptionsMenu()
         onView(withText("Settings"))
-                .perform(click())
+            .perform(click())
         selectSetting("Set Print Template")
 
         //Create a dummy file selection intent
@@ -102,7 +107,7 @@ class AppPreferenceSettingsTest: BaseTest() {
 
         // Click on file fetch
         onView(withId(R.id.filefetch))
-                .perform(click())
+            .perform(click())
 
         // Confirm that the file selection intent was called.
         intended(expectedIntent)
@@ -110,26 +115,26 @@ class AppPreferenceSettingsTest: BaseTest() {
 
     private fun selectSetting(text: String) {
         onView(withText("CommCare > Settings"))
-                .check(matches(isDisplayed()))
-        onView(withId(R.id.recycler_view))
-                .perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-                        hasDescendant(withText(text))
+            .check(matches(isDisplayed()))
+        onView(withId(androidx.preference.R.id.recycler_view))
+            .perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
+                hasDescendant(withText(text))
                 ))
         onView(withText(text))
-                .perform(click())
+            .perform(click())
     }
 
     private fun cancelSettingChangeDialog() {
         onView(withText("CANCEL"))
-                .perform(click())
+            .perform(click())
         onView(withText("CommCare > Settings"))
-                .check(matches(isDisplayed()))
+            .check(matches(isDisplayed()))
     }
 
     private fun changePreferenceAndCheckPersistence(newPref: String, setting: String) {
         // Change to new preference
         onView(withText(newPref))
-                .perform(click())
+            .perform(click())
 
         //Rotate and check the selection persists.
         InstrumentationUtility.rotateLeft()
@@ -142,8 +147,8 @@ class AppPreferenceSettingsTest: BaseTest() {
 
     private fun matchSelectedPreference(value: String) {
         onView(allOf(
-                withClassName(endsWith("AppCompatCheckedTextView")),
-                withText(value)
+            withClassName(endsWith("AppCompatCheckedTextView")),
+            withText(value)
         )).check(matches(isChecked()))
     }
 
diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/BaseTest.kt b/app/instrumentation-tests/src/org/commcare/androidTests/BaseTest.kt
index 6466c8064b..96d409766c 100644
--- a/app/instrumentation-tests/src/org/commcare/androidTests/BaseTest.kt
+++ b/app/instrumentation-tests/src/org/commcare/androidTests/BaseTest.kt
@@ -1,6 +1,7 @@
 package org.commcare.androidTests
 
 import android.Manifest
+import android.os.Build
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -22,16 +23,7 @@ abstract class BaseTest {
 
     @Rule
     @JvmField
-    var permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-            Manifest.permission.READ_PHONE_STATE,
-            Manifest.permission.CALL_PHONE,
-            Manifest.permission.ACCESS_FINE_LOCATION,
-            Manifest.permission.ACCESS_COARSE_LOCATION,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.RECORD_AUDIO,
-            Manifest.permission.CAMERA
-    )
+    var permissionRule: GrantPermissionRule = GrantPermissionRule.grant(*getAppPermissions())
 
     protected open fun installApp(appName: String, ccz: String, force: Boolean = false) {
         if (CommCareApplication.instance().currentApp == null) {
@@ -44,4 +36,27 @@ abstract class BaseTest {
             Espresso.pressBack()
         }
     }
+
+    private fun getAppPermissions(): Array<String> {
+        var appPermissions = mutableListOf(
+                Manifest.permission.READ_PHONE_STATE,
+                Manifest.permission.CALL_PHONE,
+                Manifest.permission.ACCESS_FINE_LOCATION,
+                Manifest.permission.ACCESS_COARSE_LOCATION,
+                Manifest.permission.RECORD_AUDIO,
+                Manifest.permission.CAMERA)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            appPermissions.addAll(arrayOf(
+                    Manifest.permission.READ_MEDIA_IMAGES,
+                    Manifest.permission.READ_MEDIA_AUDIO,
+                    Manifest.permission.READ_MEDIA_VIDEO,
+                    Manifest.permission.POST_NOTIFICATIONS))
+        } else {
+            appPermissions.addAll(arrayOf(
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                    Manifest.permission.READ_EXTERNAL_STORAGE))
+        }
+        return appPermissions.toTypedArray()
+    }
 }
diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/DateWidgetsTests.kt b/app/instrumentation-tests/src/org/commcare/androidTests/DateWidgetsTests.kt
index 2d69aaa68f..ad13ec2aa1 100644
--- a/app/instrumentation-tests/src/org/commcare/androidTests/DateWidgetsTests.kt
+++ b/app/instrumentation-tests/src/org/commcare/androidTests/DateWidgetsTests.kt
@@ -27,21 +27,18 @@ import java.util.*
 import kotlin.math.absoluteValue
 
 
-
 @RunWith(AndroidJUnit4::class)
 @LargeTest
-@BrowserstackTests
-class DateWidgetsTests: BaseTest() {
+class DateWidgetsTests : BaseTest() {
     companion object {
         const val CCZ_NAME = "date_widgets_tests.ccz"
         const val APP_NAME = "Date Widgets"
-        val listOfNepaliMonths = listOf("Baishakh","Jestha","Ashadh","Shrawan",
-                            "Bhadra","Ashwin","Kartik","Mangsir","Poush","Magh",
-                            "Falgun","Chaitra")
-        val listOfEthiopianMonths = listOf("Säne","Hämle","Nähäse","P’agume",
-                "Mäskäräm","T’ïk’ïmt","Hïdar","Tahsas","T’ïr","Yäkatit",
-                "Mägabit","Miyaziya","Gïnbot")
-
+        val listOfNepaliMonths = listOf("Baishakh", "Jestha", "Ashadh", "Shrawan",
+                "Bhadra", "Ashwin", "Kartik", "Mangsir", "Poush", "Magh",
+                "Falgun", "Chaitra")
+        val listOfEthiopianMonths = listOf("Säne", "Hämle", "Nähäse", "P’agume",
+                "Mäskäräm", "T’ïk’ïmt", "Hïdar", "Tahsas", "T’ïr", "Yäkatit",
+                "Mägabit", "Miyaziya", "Gïnbot")
     }
 
     @Before
@@ -53,34 +50,46 @@ class DateWidgetsTests: BaseTest() {
     /**
      * Adding the teardown method so the tests doesnot fail after only thefirst execution, when executed as a whole.
      */
-
     @After
-    fun teardown(){
+    fun teardown() {
         InstrumentationUtility.logout()
     }
 
     @Test
-    fun testDateWidgets(){
+    fun testDateWidgets() {
         testDateWidgetMonths(listOfNepaliMonths, 0)
         testDateWidgetMonths(listOfEthiopianMonths, 1)
     }
 
+    @Test
+    fun testStandardWidget() {
+        InstrumentationUtility.openModule(4)
+        InstrumentationUtility.rotateLeft()
+        val date = setDateTo(-10)
+        val dateFormates = getDateInDifferentFormats(date)
+        InstrumentationUtility.rotatePortrait()
+        InstrumentationUtility.nextPage()
+        for (formats in dateFormates) {
+            assertTrue(onView(allOf(withSubstring(formats))).isPresent())
+        }
+        InstrumentationUtility.submitForm()
+        assertTrue(onView(ViewMatchers.withText("1 form sent to server!")).isPresent())
+    }
 
-    fun testDateWidgetMonths(listOfMonths: List<String>, module: Int){
-
+    private fun testDateWidgetMonths(listOfMonths: List<String>, module: Int) {
         InstrumentationUtility.openModule(module)
         InstrumentationUtility.nextPage()
         InstrumentationUtility.nextPage()
 
-            // reads the current month, gets the current index in the list, rotates the list starting from current month
+        // reads the current month, gets the current index in the list, rotates the list starting from current month
         val monthText = InstrumentationUtility.getText(onView(withId(R.id.monthtxt)))
         listOfMonths.toMutableList()
         val index = listOfMonths.indexOf(monthText)
         assertTrue(index != -1)
         Collections.rotate(listOfMonths, -index)
 
-            //asserts if months are present in order
-        for (listItem in listOfMonths){
+        //asserts if months are present in order
+        for (listItem in listOfMonths) {
             assertTrue(onView(withText(listItem)).isPresent())
             onView(withId(R.id.monthupbtn)).perform(ViewActions.click())
         }
@@ -96,26 +105,10 @@ class DateWidgetsTests: BaseTest() {
         assertTrue(onView(ViewMatchers.withText("1 form sent to server!")).isPresent())
     }
 
-    @Test
-    fun testStandardWidget(){
-        InstrumentationUtility.openModule(4)
-        InstrumentationUtility.rotateLeft()
-        val date = setDateTo(-10)
-        val dateFormates = getDateInDifferentFormats(date)
-        InstrumentationUtility.rotatePortrait()
-        InstrumentationUtility.nextPage()
-        for (formats in dateFormates){
-            assertTrue(onView(allOf(withSubstring(formats))).isPresent())
-        }
-        InstrumentationUtility.submitForm()
-        assertTrue(onView(ViewMatchers.withText("1 form sent to server!")).isPresent())
-
-    }
-
     /**
      * function to set date in the date picker
      */
-    fun setDateTo(days: Int) : Date {
+    private fun setDateTo(days: Int): Date {
         val calendar = Calendar.getInstance()
         calendar.add(Calendar.DATE, +days)
 
@@ -123,11 +116,11 @@ class DateWidgetsTests: BaseTest() {
         val month: Int = calendar.get(Calendar.MONTH) + 1
         val day: Int = calendar.get(Calendar.DAY_OF_MONTH)
         onView(
-            ViewMatchers.withClassName(
-                Matchers.equalTo(
-                    DatePicker::class.java.name
+                ViewMatchers.withClassName(
+                        Matchers.equalTo(
+                                DatePicker::class.java.name
+                        )
                 )
-            )
         ).perform(PickerActions.setDate(year, month, day))
 
         return calendar.time
@@ -136,36 +129,36 @@ class DateWidgetsTests: BaseTest() {
     /**
      * function returns different format of the selected date
      */
-    fun getDateInDifferentFormats(date : Date) : Array<String>{
-        val longFormat = SimpleDateFormat("EE, MMM d, yyyy").format(date)
+    private fun getDateInDifferentFormats(date: Date): Array<String> {
+        val longFormat = SimpleDateFormat("EE, MMM d, yyyy", Locale.ENGLISH).format(date)
         val shortFormat = SimpleDateFormat("d/M/yy").format(date)
         val unformattedDate = SimpleDateFormat("yyyy-MM-dd").format(date)
-        return arrayOf(longFormat.toString(),shortFormat.toString(),unformattedDate.toString())
+        return arrayOf(longFormat.toString(), shortFormat.toString(), unformattedDate.toString())
     }
+
     /**
      * function to set date in the date universal picker
      */
-    fun setDateToUniversalCalender(days: Int) : String{
-
-        var dayChangeViewInteraction = if(days > 0) onView(withId(R.id.dayupbtn)) else onView(withId(R.id. daydownbtn))
-        for (day in 1..days.absoluteValue){
+    private fun setDateToUniversalCalender(days: Int): String {
+        var dayChangeViewInteraction = if (days > 0) onView(withId(R.id.dayupbtn)) else onView(withId(R.id.daydownbtn))
+        for (day in 1..days.absoluteValue) {
             dayChangeViewInteraction.perform(ViewActions.click())
         }
         var selectedDay = InstrumentationUtility.getText(onView(withId(R.id.daytxt)))
         val selectedMonth = InstrumentationUtility.getText(onView(withId(R.id.monthtxt)))
         val selectedYear = InstrumentationUtility.getText(onView(withId(R.id.yeartxt)))
-        selectedDay = selectedDay.replaceFirst("0","")
-        val selectedDate = selectedDay+" "+selectedMonth+" "+selectedYear
+        selectedDay = selectedDay.replaceFirst("0", "")
+        val selectedDate = selectedDay + " " + selectedMonth + " " + selectedYear
         return selectedDate
     }
 
     /**
      * format the gregorian date
      */
-    fun formatGregorianDate(date: String) : String{
+    private fun formatGregorianDate(date: String): String {
         val formatter = DateTimeFormatter.ofPattern("d MMMM yyyy")
         val date = LocalDate.parse(date, formatter)
         val newDate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(date)
         return newDate
     }
-}
\ No newline at end of file
+}
diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt b/app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt
index ddb24a05f1..78f92ce3d5 100644
--- a/app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt
+++ b/app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt
@@ -2,6 +2,7 @@ package org.commcare.androidTests
 
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -44,15 +45,16 @@ class DialogTests: BaseTest() {
         onView(withId(R.id.nav_btn_next))
                 .perform(click())
 
-        withText("Add a new \"Error on add\" group?").isDisplayed()
+        onView(withId(R.id.choice_dialog_panel_2)).check(matches(withText("Add a new Error on add?")))
 
         InstrumentationUtility.rotateLeft()
         //TODO Expect dialog to not persist due to a activity lifecycle bug in our dialog framework.
-        withText("Add a new \"Error on add\" group?").doesNotExist()
+        withText(R.id.choice_dialog_panel_2).doesNotExist()
+
         InstrumentationUtility.rotatePortrait()
         onView(withId(R.id.nav_btn_next))
                 .perform(click())
-        onView(withText("ADD GROUP"))
+        onView(withId(R.id.choice_dialog_panel_2))
                 .perform(click())
 
         checkDialogExistence_withRotation("Error Occurred")
diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/InstallFromListTest.kt b/app/instrumentation-tests/src/org/commcare/androidTests/InstallFromListTest.kt
index 22b0084c50..2d275a0074 100644
--- a/app/instrumentation-tests/src/org/commcare/androidTests/InstallFromListTest.kt
+++ b/app/instrumentation-tests/src/org/commcare/androidTests/InstallFromListTest.kt
@@ -17,8 +17,8 @@ import org.commcare.CommCareInstrumentationTestApplication
 import org.commcare.activities.InstallFromListActivity
 import org.commcare.android.database.global.models.AppAvailableToInstall
 import org.commcare.annotations.BrowserstackTests
-import org.commcare.dalvik.BuildConfig
 import org.commcare.dalvik.R
+import org.commcare.dalvik.test.BuildConfig
 import org.commcare.utils.CustomMatchers
 import org.commcare.utils.InstrumentationUtility
 import org.commcare.utils.isPresent
diff --git a/app/instrumentation-tests/src/org/commcare/utils/HQApi.java b/app/instrumentation-tests/src/org/commcare/utils/HQApi.java
index 6cffd97da1..e0b2421a99 100644
--- a/app/instrumentation-tests/src/org/commcare/utils/HQApi.java
+++ b/app/instrumentation-tests/src/org/commcare/utils/HQApi.java
@@ -9,7 +9,7 @@
 import org.commcare.core.network.AuthInfo;
 import org.commcare.core.network.CommCareNetworkService;
 import org.commcare.core.network.CommCareNetworkServiceGenerator;
-import org.commcare.dalvik.BuildConfig;
+import org.commcare.dalvik.test.BuildConfig;
 import org.commcare.modern.util.Pair;
 import org.commcare.network.HttpUtils;
 import org.joda.time.DateTime;
diff --git a/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt b/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt
index 335637f788..7fc13ce7eb 100644
--- a/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt
+++ b/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt
@@ -15,17 +15,33 @@ import android.widget.TextView
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
-import androidx.test.espresso.*
-import androidx.test.espresso.Espresso.*
-import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.DataInteraction
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.ViewActions.clearText
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.swipeUp
+import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.espresso.matcher.RootMatchers
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withChild
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.espresso.util.HumanReadables
 import androidx.test.espresso.util.TreeIterables
 import androidx.test.platform.app.InstrumentationRegistry
@@ -38,15 +54,15 @@ import org.commcare.CommCareInstrumentationTestApplication
 import org.commcare.dalvik.R
 import org.commcare.services.CommCareSessionService
 import org.commcare.utils.CustomMatchers.withChildViewCount
+import org.hamcrest.CoreMatchers.anything
+import org.hamcrest.CoreMatchers.startsWith
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
-import org.hamcrest.Matchers.*
 import org.hamcrest.StringDescription
 import org.javarosa.core.io.StreamsUtil
 import org.junit.Assert.assertTrue
 import java.io.File
 import java.io.IOException
-import java.util.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
@@ -81,26 +97,26 @@ object InstrumentationUtility {
         stubCcz(cczName)
         openOptionsMenu()
         onView(withText("Offline Install"))
-                .perform(click())
+            .perform(click())
         onView(withId(R.id.screen_multimedia_inflater_filefetch))
-                .perform(click())
+            .perform(click())
         onView(withId(R.id.screen_multimedia_inflater_install))
-                .perform(click())
+            .perform(click())
     }
 
     @JvmStatic
     fun uninstallCurrentApp() {
         openOptionsMenu()
         onView(withText("Go To App Manager"))
-                .perform(click())
+            .perform(click())
         clickListItem(R.id.apps_list_view, 0)
         onView(withText("Uninstall"))
-                .perform(click())
+            .perform(click())
         onView(withText("OK"))
-                .inRoot(RootMatchers.isDialog())
-                .perform(click())
+            .inRoot(RootMatchers.isDialog())
+            .perform(click())
         onView(withId(R.id.install_app_button))
-                .perform(click())
+            .perform(click())
     }
 
     @JvmStatic
@@ -109,21 +125,21 @@ object InstrumentationUtility {
         enterText(R.id.edit_password, password)
         onView(isRoot()).perform(swipeUp())
         onView(withId(R.id.login_button))
-                .perform(click())
+            .perform(click())
     }
 
     @JvmStatic
     fun openModule(text: String) {
         onView(withText("Start"))
-                .perform(click())
+            .perform(click())
         onView(withText(text))
-                .perform(click())
+            .perform(click())
     }
 
     @JvmStatic
     fun openModule(module: Int) {
         onView(withText("Start"))
-                .perform(click())
+            .perform(click())
         clickListItem(R.id.screen_suite_menu_list, module)
     }
 
@@ -145,9 +161,9 @@ object InstrumentationUtility {
         for (i in 0..3) {
             openOptionsMenu()
             onView(withText("About CommCare"))
-                    .perform(click())
+                .perform(click())
             onView(withText("OK"))
-                    .perform(click())
+                .perform(click())
         }
     }
 
@@ -159,9 +175,9 @@ object InstrumentationUtility {
     @JvmStatic
     fun clickListItem(@IdRes resId: Int, position: Int) {
         onData(anything())
-                .inAdapterView(withId(resId))
-                .atPosition(position)
-                .perform(click())
+            .inAdapterView(withId(resId))
+            .atPosition(position)
+            .perform(click())
     }
 
     /**
@@ -173,9 +189,9 @@ object InstrumentationUtility {
     @JvmStatic
     fun getSubViewInListItem(@IdRes listId: Int, position: Int, @IdRes subviewId: Int): DataInteraction {
         return onData(anything())
-                .inAdapterView(withId(listId))
-                .atPosition(position)
-                .onChildView(withId(subviewId))
+            .inAdapterView(withId(listId))
+            .atPosition(position)
+            .onChildView(withId(subviewId))
     }
 
     /**
@@ -185,7 +201,7 @@ object InstrumentationUtility {
     @JvmStatic
     fun openFirstIncompleteForm() {
         onView(withText(startsWith("Incomplete")))
-                .perform(click())
+            .perform(click())
         clickListItem(R.id.screen_entity_select_list, 0)
     }
 
@@ -193,9 +209,9 @@ object InstrumentationUtility {
     fun logout() {
         gotoHome()
         onView(withId(R.id.home_gridview_buttons))
-                .perform(swipeUp())
+            .perform(swipeUp())
         onView(withText("Log out of CommCare"))
-                .perform(click())
+            .perform(click())
     }
 
     /**
@@ -207,7 +223,7 @@ object InstrumentationUtility {
         var intentCallback = onImageCaptureIntentSent()
         IntentMonitorRegistry.getInstance().addIntentCallback(intentCallback)
         onView(withText(R.string.capture_image))
-                .perform(click())
+            .perform(click())
         IntentMonitorRegistry.getInstance().removeIntentCallback(intentCallback)
     }
 
@@ -217,7 +233,7 @@ object InstrumentationUtility {
     @JvmStatic
     fun nextPage() {
         onView(withId(R.id.nav_btn_next))
-                .perform(click())
+            .perform(click())
     }
 
     /**
@@ -235,9 +251,9 @@ object InstrumentationUtility {
     @JvmStatic
     fun sleep(seconds: Int) {
         onView(isRoot())
-                .perform(sleep(
-                        TimeUnit.SECONDS.toMillis(seconds.toLong())
-                ))
+            .perform(sleep(
+                TimeUnit.SECONDS.toMillis(seconds.toLong())
+            ))
     }
 
     /**
@@ -246,10 +262,10 @@ object InstrumentationUtility {
     @JvmStatic
     fun matchChildCount(parent: Class<*>, child: Class<*>, count: Int) {
         onView(withClassName(Matchers.`is`(parent.canonicalName)))
-                .check(matches(
-                        withChildViewCount(count,
-                                withClassName(Matchers.`is`(child.canonicalName)))
-                ))
+            .check(matches(
+                withChildViewCount(count,
+                    withClassName(Matchers.`is`(child.canonicalName)))
+            ))
     }
 
     /**
@@ -259,9 +275,9 @@ object InstrumentationUtility {
     @JvmStatic
     fun getListSize(@IdRes resId: Int): Int {
         val application = InstrumentationRegistry
-                .getInstrumentation()
-                .targetContext
-                .applicationContext as CommCareInstrumentationTestApplication
+            .getInstrumentation()
+            .targetContext
+            .applicationContext as CommCareInstrumentationTestApplication
         val activity = application.currentActivity
         val listView = activity.findViewById<ListView>(resId)
         return listView.adapter.count
@@ -290,21 +306,22 @@ object InstrumentationUtility {
     @JvmStatic
     fun enterText(@IdRes editTextId: Int, text: String) {
         onView(withId(editTextId))
-                .perform(clearText())
+            .perform(clearText())
         onView(withId(editTextId))
-                .perform(typeText(text))
+            .perform(typeText(text))
         Espresso.closeSoftKeyboard()
     }
 
     fun enterText(text: String) {
         onView(withClassName(Matchers.endsWith("EditText")))
-                .perform(typeText((text)))
+            .perform(typeText((text)))
         Espresso.closeSoftKeyboard()
     }
+
     /**
      * A utility to match the text present in a textfield
      */
-    fun matchTypedText(@IdRes editTextId: Int, text: String){
+    fun matchTypedText(@IdRes editTextId: Int, text: String) {
         onView(withId(editTextId)).check(matches(withText(text)))
     }
 
@@ -353,6 +370,7 @@ object InstrumentationUtility {
         val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mDevice.pressBack()
     }
+
     /**
      * The method does following in order:
      * 1. Closes keyboard.
@@ -364,7 +382,7 @@ object InstrumentationUtility {
         Espresso.closeSoftKeyboard()
         Espresso.pressBack()
         onView(withText(backOption))
-                .perform(click())
+            .perform(click())
     }
 
     /**
@@ -376,11 +394,11 @@ object InstrumentationUtility {
     fun selectOptionItem(matcher: Matcher<View>) {
         openOptionsMenu()
         onView(matcher)
-                .perform(click())
+            .perform(click())
     }
 
     @JvmStatic
-    fun stubIntentWithAction(action : String) {
+    fun stubIntentWithAction(action: String) {
         Intents.intending(IntentMatchers.hasAction(action))
                 .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, Intent()))
     }
@@ -394,7 +412,7 @@ object InstrumentationUtility {
     @JvmStatic
     fun <T> assertCurrentActivity(clazz: Class<T>) {
         val application = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
-                as CommCareInstrumentationTestApplication
+            as CommCareInstrumentationTestApplication
         val activity = application.currentActivity
         assert(clazz.isInstance(activity), "Current Activity is ${activity.localClassName}")
     }
@@ -461,14 +479,12 @@ object InstrumentationUtility {
         }
     }
 
-
-
     /**
      * A utility to verify Form Fields with their values
      */
 
     fun verifyFormCellAndValue(cellData: String, value: String) {
-        val result : Boolean = onView(
+        val result: Boolean = onView(
             Matchers.allOf(
                 withId(R.id.detail_type_text),
                 withText(cellData),
@@ -491,9 +507,9 @@ object InstrumentationUtility {
     /**
      * utility to search a case in Form list and select the same
      */
-    fun searchCaseAndSelect(text: String){
+    fun searchCaseAndSelect(text: String) {
         onView(withId(R.id.search_action_bar)).perform(click())
-        enterText(R.id.search_src_text,text)
+        enterText(androidx.appcompat.R.id.search_src_text, text)
         onView(withId(R.id.screen_entity_detail_list)).isPresent()
         clickListItem(R.id.screen_entity_select_list, 0)
     }
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 89889f928b..36776971ea 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -13,8 +13,8 @@ android {
 
 task jacocoTestReport(type: JacocoReport, dependsOn: ['testCommcareDebugUnitTest']) {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
     }
     def fileFilter = ['**/R.class',
                       '**/R$*.class',
diff --git a/app/libs/LibSimprints-1.0.12.aar b/app/libs/LibSimprints-1.0.12.aar
new file mode 100644
index 0000000000..89c5d62fe5
Binary files /dev/null and b/app/libs/LibSimprints-1.0.12.aar differ
diff --git a/app/libs/mapbox-android-accounts-0.2.0.aar b/app/libs/mapbox-android-accounts-0.2.0.aar
new file mode 100644
index 0000000000..06c0c3b483
Binary files /dev/null and b/app/libs/mapbox-android-accounts-0.2.0.aar differ
diff --git a/app/libs/realm-android-library-4.1.1.aar b/app/libs/realm-android-library-4.1.1.aar
new file mode 100644
index 0000000000..700e71742c
Binary files /dev/null and b/app/libs/realm-android-library-4.1.1.aar differ
diff --git a/app/libs/rtl-viewpager-2.0.0.aar b/app/libs/rtl-viewpager-2.0.0.aar
new file mode 100644
index 0000000000..8738d88d30
Binary files /dev/null and b/app/libs/rtl-viewpager-2.0.0.aar differ
diff --git a/app/libs/storage-2.1.0.aar b/app/libs/storage-2.1.0.aar
new file mode 100644
index 0000000000..37b42e12a4
Binary files /dev/null and b/app/libs/storage-2.1.0.aar differ
diff --git a/app/libs/volley-1.1.0.aar b/app/libs/volley-1.1.0.aar
new file mode 100644
index 0000000000..e66b347864
Binary files /dev/null and b/app/libs/volley-1.1.0.aar differ
diff --git a/app/proguard-multidex.pro b/app/proguard-multidex.pro
deleted file mode 100644
index 8748e2dfb1..0000000000
--- a/app/proguard-multidex.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-#Need to make sure these classes are available in primary dex file
--keep class org.commcare.** { *; }
\ No newline at end of file
diff --git a/app/proguard.cfg b/app/proguard.cfg
index 92f4da642e..5cf741f60b 100644
--- a/app/proguard.cfg
+++ b/app/proguard.cfg
@@ -53,6 +53,8 @@
 -dontwarn sun.misc.Unsafe
 
 -dontwarn org.xmlpull.v1.**
+-dontwarn org.kxml2.io.**
+-dontwarn android.content.res.**
 -dontwarn javax.annotation.**,javax.microedition.**
 -dontwarn org.apache.**
 -dontwarn org.joda.**
@@ -93,8 +95,16 @@
 -keep class javax.xml.bind.annotation.** { *; }
 -dontwarn javax.xml.bind.annotation.**
 
+#OkHttp3
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontnote okhttp3.**
 
 #Retrofit Stuff
+-keep class retrofit2.Call { *; }
 -dontnote retrofit2.Platform
 -dontwarn retrofit2.Platform$Java8
 -keepattributes Signature
@@ -225,4 +235,4 @@
 # androidx.test.ext.truth.content.IntentSubject.hasAction fails in it-tests without this
 -keep class com.google.common.base.Preconditions { *; }
 
-# Guava Config End
+# Guava Config End
\ No newline at end of file
diff --git a/app/res/color/button_green_background.xml b/app/res/color/button_green_background.xml
new file mode 100644
index 0000000000..bf0ae6833f
--- /dev/null
+++ b/app/res/color/button_green_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled state -->
+    <item android:state_enabled="false" android:color="@color/green_700" />
+    <!-- Pressed state -->
+    <item android:state_pressed="true" android:color="@color/green_900" />
+    <!-- Default state -->
+    <item android:color="@color/green_500" />
+</selector>
+
diff --git a/app/res/color/button_orange_background.xml b/app/res/color/button_orange_background.xml
new file mode 100644
index 0000000000..1493a7709c
--- /dev/null
+++ b/app/res/color/button_orange_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled state -->
+    <item android:state_enabled="false" android:color="@color/orange_700" />
+    <!-- Pressed state -->
+    <item android:state_pressed="true" android:color="@color/orange_900" />
+    <!-- Default state -->
+    <item android:color="@color/orange_500" />
+</selector>
\ No newline at end of file
diff --git a/app/res/color/button_red_background.xml b/app/res/color/button_red_background.xml
new file mode 100644
index 0000000000..0fca04b82b
--- /dev/null
+++ b/app/res/color/button_red_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled state -->
+    <item android:state_enabled="false" android:color="@color/red_700" />
+    <!-- Pressed state -->
+    <item android:state_pressed="true" android:color="@color/red_900" />
+    <!-- Default state -->
+    <item android:color="@color/red_500" />
+</selector>
\ No newline at end of file
diff --git a/app/res/color/primary_button_background.xml b/app/res/color/primary_button_background.xml
index 90bafb37c1..22f6c49dad 100644
--- a/app/res/color/primary_button_background.xml
+++ b/app/res/color/primary_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/button_disabled" android:state_enabled="false" />
-    <item android:color="@color/button_primary" />
+    <item android:color="@color/button_primary_color" />
 </selector>
\ No newline at end of file
diff --git a/app/res/drawable-hdpi-v14/notification.png b/app/res/drawable-hdpi-v14/notification.png
deleted file mode 100644
index a307880630..0000000000
Binary files a/app/res/drawable-hdpi-v14/notification.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/ic_media_exit_fullscreen.png b/app/res/drawable-hdpi/ic_media_exit_fullscreen.png
new file mode 100644
index 0000000000..5300f949d7
Binary files /dev/null and b/app/res/drawable-hdpi/ic_media_exit_fullscreen.png differ
diff --git a/app/res/drawable-hdpi/ic_media_fullscreen.png b/app/res/drawable-hdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000000..80d4d99478
Binary files /dev/null and b/app/res/drawable-hdpi/ic_media_fullscreen.png differ
diff --git a/app/res/drawable-hdpi/icon_app_white.png b/app/res/drawable-hdpi/icon_app_white.png
deleted file mode 100644
index 4e2c034930..0000000000
Binary files a/app/res/drawable-hdpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/notification.png b/app/res/drawable-hdpi/notification.png
deleted file mode 100644
index b62adeb031..0000000000
Binary files a/app/res/drawable-hdpi/notification.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/pause_question_audio.png b/app/res/drawable-hdpi/pause_question_audio.png
index 8d1a5e26f6..0093ff1f67 100644
Binary files a/app/res/drawable-hdpi/pause_question_audio.png and b/app/res/drawable-hdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-hdpi/play_question_audio.png b/app/res/drawable-hdpi/play_question_audio.png
index ef923b91d1..da3d7eeec0 100644
Binary files a/app/res/drawable-hdpi/play_question_audio.png and b/app/res/drawable-hdpi/play_question_audio.png differ
diff --git a/app/res/drawable-large/commcare_logo.png b/app/res/drawable-large/commcare_logo.png
deleted file mode 100644
index c7970c0bec..0000000000
Binary files a/app/res/drawable-large/commcare_logo.png and /dev/null differ
diff --git a/app/res/drawable-ldpi-v14/notification.png b/app/res/drawable-ldpi-v14/notification.png
deleted file mode 100644
index 51ba81206b..0000000000
Binary files a/app/res/drawable-ldpi-v14/notification.png and /dev/null differ
diff --git a/app/res/drawable-ldpi/ic_media_exit_fullscreen.png b/app/res/drawable-ldpi/ic_media_exit_fullscreen.png
new file mode 100644
index 0000000000..7197f3b5d3
Binary files /dev/null and b/app/res/drawable-ldpi/ic_media_exit_fullscreen.png differ
diff --git a/app/res/drawable-ldpi/ic_media_fullscreen.png b/app/res/drawable-ldpi/ic_media_fullscreen.png
new file mode 100644
index 0000000000..6023203e78
Binary files /dev/null and b/app/res/drawable-ldpi/ic_media_fullscreen.png differ
diff --git a/app/res/drawable-ldpi/icon_app_white.png b/app/res/drawable-ldpi/icon_app_white.png
deleted file mode 100644
index 0495c7abdb..0000000000
Binary files a/app/res/drawable-ldpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-ldpi/notification.png b/app/res/drawable-ldpi/notification.png
deleted file mode 100644
index 3a53999386..0000000000
Binary files a/app/res/drawable-ldpi/notification.png and /dev/null differ
diff --git a/app/res/drawable-mdpi-v14/notification.png b/app/res/drawable-mdpi-v14/notification.png
deleted file mode 100644
index 283e66dce0..0000000000
Binary files a/app/res/drawable-mdpi-v14/notification.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/ic_media_exit_fullscreen.png b/app/res/drawable-mdpi/ic_media_exit_fullscreen.png
new file mode 100644
index 0000000000..6cc908f45b
Binary files /dev/null and b/app/res/drawable-mdpi/ic_media_exit_fullscreen.png differ
diff --git a/app/res/drawable-mdpi/ic_media_fullscreen.png b/app/res/drawable-mdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000000..a07ff0bda3
Binary files /dev/null and b/app/res/drawable-mdpi/ic_media_fullscreen.png differ
diff --git a/app/res/drawable-mdpi/icon_app_white.png b/app/res/drawable-mdpi/icon_app_white.png
deleted file mode 100644
index 90f745543b..0000000000
Binary files a/app/res/drawable-mdpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/notification.png b/app/res/drawable-mdpi/notification.png
deleted file mode 100644
index 88bba12b48..0000000000
Binary files a/app/res/drawable-mdpi/notification.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/pause_question_audio.png b/app/res/drawable-mdpi/pause_question_audio.png
index 61edf086c1..1bd7dcb056 100644
Binary files a/app/res/drawable-mdpi/pause_question_audio.png and b/app/res/drawable-mdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-mdpi/play_question_audio.png b/app/res/drawable-mdpi/play_question_audio.png
index a52be7a023..912853bbdb 100644
Binary files a/app/res/drawable-mdpi/play_question_audio.png and b/app/res/drawable-mdpi/play_question_audio.png differ
diff --git a/app/res/drawable-xhdpi/ic_media_exit_fullscreen.png b/app/res/drawable-xhdpi/ic_media_exit_fullscreen.png
new file mode 100644
index 0000000000..d561d875bf
Binary files /dev/null and b/app/res/drawable-xhdpi/ic_media_exit_fullscreen.png differ
diff --git a/app/res/drawable-xhdpi/ic_media_fullscreen.png b/app/res/drawable-xhdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000000..62d9a465c6
Binary files /dev/null and b/app/res/drawable-xhdpi/ic_media_fullscreen.png differ
diff --git a/app/res/drawable-xhdpi/icon_app_white.png b/app/res/drawable-xhdpi/icon_app_white.png
deleted file mode 100644
index 12f02e63f3..0000000000
Binary files a/app/res/drawable-xhdpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-xhdpi/pause_question_audio.png b/app/res/drawable-xhdpi/pause_question_audio.png
index 627f96e7e0..1f77f3a5dd 100644
Binary files a/app/res/drawable-xhdpi/pause_question_audio.png and b/app/res/drawable-xhdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-xhdpi/play_question_audio.png b/app/res/drawable-xhdpi/play_question_audio.png
index fb26073fe6..d231d4a4d0 100644
Binary files a/app/res/drawable-xhdpi/play_question_audio.png and b/app/res/drawable-xhdpi/play_question_audio.png differ
diff --git a/app/res/drawable-xxhdpi/ic_media_exit_fullscreen.png b/app/res/drawable-xxhdpi/ic_media_exit_fullscreen.png
new file mode 100644
index 0000000000..99dd79cd36
Binary files /dev/null and b/app/res/drawable-xxhdpi/ic_media_exit_fullscreen.png differ
diff --git a/app/res/drawable-xxhdpi/ic_media_fullscreen.png b/app/res/drawable-xxhdpi/ic_media_fullscreen.png
new file mode 100644
index 0000000000..a1f19b0489
Binary files /dev/null and b/app/res/drawable-xxhdpi/ic_media_fullscreen.png differ
diff --git a/app/res/drawable-xxxhdpi/pause_question_audio.png b/app/res/drawable-xxxhdpi/pause_question_audio.png
index 295a704ff6..74d106537f 100644
Binary files a/app/res/drawable-xxxhdpi/pause_question_audio.png and b/app/res/drawable-xxxhdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-xxxhdpi/play_question_audio.png b/app/res/drawable-xxxhdpi/play_question_audio.png
index 4655703b3f..628e87ea15 100644
Binary files a/app/res/drawable-xxxhdpi/play_question_audio.png and b/app/res/drawable-xxxhdpi/play_question_audio.png differ
diff --git a/app/res/drawable/actionbar_modern_spacing.xml b/app/res/drawable/actionbar_modern_spacing.xml
deleted file mode 100644
index acf2c3d719..0000000000
--- a/app/res/drawable/actionbar_modern_spacing.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="8dp"
-        android:drawable="@drawable/icon_app_white"
-        android:right="8dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/res/drawable/btn_finish_background.xml b/app/res/drawable/btn_finish_background.xml
index 060b6bed00..ead1dc4273 100644
--- a/app/res/drawable/btn_finish_background.xml
+++ b/app/res/drawable/btn_finish_background.xml
@@ -4,5 +4,5 @@
         android:state_pressed="true"
         android:drawable="@color/cc_attention_positive_text"/>
     <item
-        android:drawable="@color/cc_attention_positive_color"/>
+        android:drawable="@color/start_home_button"/>
 </selector>
\ No newline at end of file
diff --git a/app/res/drawable/button_background_white.xml b/app/res/drawable/button_background_white.xml
new file mode 100644
index 0000000000..dedb7d4e34
--- /dev/null
+++ b/app/res/drawable/button_background_white.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" /> <!-- Background color -->
+    <corners android:radius="22dp" /> <!-- Rounded corners -->
+    <stroke
+        android:width="2dp"
+        android:color="@color/cc_brand_color" /> <!-- Optional border -->
+</shape>
diff --git a/app/res/drawable/button_green_background.xml b/app/res/drawable/button_green_background.xml
deleted file mode 100644
index 7c1d045bc2..0000000000
--- a/app/res/drawable/button_green_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/green_700" android:state_enabled="false" />
-    <item android:drawable="@color/green_900" android:state_pressed="true" />
-    <item android:drawable="@color/green_500" />
-
-</selector>
\ No newline at end of file
diff --git a/app/res/drawable/button_orange_background.xml b/app/res/drawable/button_orange_background.xml
deleted file mode 100644
index dd8e722370..0000000000
--- a/app/res/drawable/button_orange_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/orange_700" android:state_enabled="false" />
-    <item android:drawable="@color/orange_900" android:state_pressed="true" />
-    <item android:drawable="@color/orange_500" />
-
-</selector>
\ No newline at end of file
diff --git a/app/res/drawable/button_red_background.xml b/app/res/drawable/button_red_background.xml
deleted file mode 100644
index 2c16258f98..0000000000
--- a/app/res/drawable/button_red_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/red_700" android:state_enabled="false" />
-    <item android:drawable="@color/red_900" android:state_pressed="true" />
-    <item android:drawable="@color/red_500" />
-
-</selector>
\ No newline at end of file
diff --git a/app/res/drawable/ccbanner.png b/app/res/drawable/ccbanner.png
deleted file mode 100644
index 423a53be10..0000000000
Binary files a/app/res/drawable/ccbanner.png and /dev/null differ
diff --git a/app/res/drawable/check_update.xml b/app/res/drawable/check_update.xml
index 4e69e9ed32..c963c7cb1b 100644
--- a/app/res/drawable/check_update.xml
+++ b/app/res/drawable/check_update.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="232.5">
     <path
         android:pathData="M238.1,74.1l-117.2,109.2l-0.8,-0.9l-23,-24.6l-34,-36.6l25.2,-23.4l34,36.4l91.9,-85.7z"
-        android:fillColor="#BCDEFF"/>
+        android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/commcare_actionbar_logo.xml b/app/res/drawable/commcare_actionbar_logo.xml
new file mode 100644
index 0000000000..0157ae2e24
--- /dev/null
+++ b/app/res/drawable/commcare_actionbar_logo.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,10m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M17.591,8.821C17.286,7.737 16.584,6.836 15.611,6.287C15.111,6.005 14.57,5.834 14.018,5.775C13.992,5.539 13.95,5.304 13.886,5.071C13.582,3.987 12.879,3.086 11.907,2.537C10.934,1.987 9.809,1.854 8.738,2.162C7.667,2.47 6.777,3.181 6.235,4.166C5.956,4.672 5.788,5.22 5.729,5.779C5.496,5.805 5.264,5.847 5.034,5.912C3.963,6.22 3.073,6.931 2.53,7.916C1.988,8.9 1.856,10.039 2.16,11.124C2.465,12.208 3.167,13.108 4.14,13.658C4.639,13.94 5.181,14.11 5.733,14.17C5.759,14.405 5.801,14.641 5.865,14.873C6.169,15.958 6.872,16.858 7.844,17.408C8.817,17.957 9.942,18.09 11.013,17.782C12.084,17.474 12.974,16.763 13.516,15.778C13.795,15.273 13.963,14.725 14.022,14.165C14.255,14.139 14.487,14.097 14.717,14.032C15.788,13.724 16.678,13.013 17.221,12.029C17.762,11.044 17.893,9.905 17.591,8.821ZM7.498,4.88C7.853,4.238 8.432,3.773 9.132,3.572C9.832,3.371 10.566,3.458 11.201,3.816C11.837,4.175 12.295,4.762 12.494,5.47C12.532,5.606 12.557,5.743 12.574,5.882C12.634,6.365 12.569,6.852 12.378,7.303C12.341,7.391 12.3,7.479 12.252,7.565C12.145,7.76 11.948,8.091 11.711,8.481C10.755,7.868 8.835,6.644 8.203,6.287C7.875,6.102 7.53,5.969 7.176,5.879C7.217,5.532 7.326,5.194 7.498,4.88ZM10.946,9.973C10.946,10.571 10.466,11.057 9.875,11.057C9.284,11.057 8.804,10.571 8.804,9.973C8.804,9.374 9.284,8.889 9.875,8.889C10.466,8.889 10.946,9.374 10.946,9.973ZM6.233,11.666C6.05,11.997 5.919,12.347 5.831,12.705C5.488,12.662 5.154,12.552 4.844,12.377C4.21,12.019 3.75,11.432 3.551,10.723C3.353,10.015 3.438,9.272 3.793,8.629C4.147,7.985 4.727,7.521 5.426,7.32C5.561,7.281 5.696,7.257 5.833,7.239C6.31,7.179 6.792,7.244 7.237,7.437C7.324,7.475 7.411,7.518 7.496,7.566C7.688,7.674 8.015,7.874 8.401,8.114C7.796,9.082 6.587,11.027 6.233,11.666ZM12.251,15.064C11.897,15.706 11.317,16.172 10.617,16.373C9.918,16.574 9.184,16.487 8.548,16.128C7.913,15.77 7.454,15.183 7.256,14.475C7.217,14.339 7.193,14.201 7.176,14.063C7.116,13.58 7.18,13.093 7.37,12.642C7.407,12.553 7.448,12.465 7.497,12.38C7.604,12.185 7.801,11.854 8.038,11.463C8.995,12.076 10.914,13.301 11.547,13.658C11.874,13.843 12.22,13.976 12.574,14.066C12.532,14.412 12.424,14.751 12.251,15.064ZM15.955,11.314C15.601,11.958 15.021,12.422 14.322,12.623C14.188,12.662 14.052,12.686 13.915,12.704C13.438,12.764 12.957,12.699 12.511,12.506C12.424,12.468 12.337,12.426 12.252,12.377C12.06,12.269 11.733,12.069 11.347,11.829C11.953,10.861 13.162,8.918 13.515,8.277C13.698,7.946 13.829,7.596 13.918,7.238C14.26,7.281 14.594,7.391 14.904,7.566C15.538,7.925 15.998,8.511 16.197,9.22C16.395,9.928 16.31,10.673 15.955,11.314Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/res/drawable/commcare_actionbar_logo_spacing.xml b/app/res/drawable/commcare_actionbar_logo_spacing.xml
new file mode 100644
index 0000000000..31f5d733b5
--- /dev/null
+++ b/app/res/drawable/commcare_actionbar_logo_spacing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/commcare_actionbar_logo"
+        android:right="16dp"/>
+</layer-list>
\ No newline at end of file
diff --git a/app/res/drawable/commcare_by_dimagi.xml b/app/res/drawable/commcare_by_dimagi.xml
new file mode 100644
index 0000000000..2e5e014834
--- /dev/null
+++ b/app/res/drawable/commcare_by_dimagi.xml
@@ -0,0 +1,57 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="877dp"
+    android:height="191dp"
+    android:viewportWidth="877"
+    android:viewportHeight="191">
+  <path
+      android:pathData="M673.18,154.32C680.24,154.32 685.94,160.07 685.94,167.09C685.94,174.16 680.24,179.91 673.18,179.91C669.97,179.91 667.07,178.74 664.78,176.8H664.84V178.28C664.84,179 664.22,179.55 663.52,179.6H661.68C660.97,179.55 660.41,179.04 660.36,178.33V145.62C660.46,144.95 661.01,144.4 661.68,144.4H663.52C664.23,144.4 664.84,145.01 664.84,145.72V157.38C664.84,157.38 664.84,157.43 664.78,157.43L664.84,157.38C667.07,155.5 669.97,154.32 673.18,154.32ZM673.18,175.48C677.76,175.48 681.52,171.72 681.52,167.09C681.52,162.51 677.76,158.75 673.18,158.75C668.54,158.75 664.84,162.51 664.84,167.09C664.84,171.72 668.54,175.48 673.18,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M709.97,154.73H711.91C712.77,154.73 713.13,155.24 713.13,155.8C713.13,155.95 713.13,156.1 713.08,156.21L701.64,182.76C698.29,189.63 693.19,190.85 689.38,191C688.72,190.95 688.16,190.35 688.16,189.63V187.89C688.16,186.62 689.23,186.52 689.49,186.52C692.28,186.37 695.39,185.25 697.62,180.87L697.98,179.96C698.08,179.71 698.13,179.4 698.13,179.21C698.13,178.95 698.08,178.69 697.98,178.49C694.77,171.16 691.42,163.59 688.16,156.26C688.11,156.1 688.06,155.95 688.06,155.8C688.06,155.24 688.47,154.73 689.28,154.73H691.26C691.87,154.73 692.37,154.94 692.73,155.69L700.66,173.7C700.71,173.7 700.71,173.65 700.71,173.65L708.4,155.8C708.74,154.99 709.31,154.73 709.97,154.73Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M752.57,145.79V178.35C752.57,179.05 752,179.62 751.3,179.67H749.42C748.71,179.62 748.16,179.05 748.16,178.35V176.82V176.87C745.92,178.74 742.97,179.98 739.82,179.98C732.75,179.98 727,174.23 727,167.15C727,160.08 732.75,154.38 739.82,154.38C742.97,154.38 745.87,155.5 748.1,157.44L748.16,157.49C748.16,157.44 748.16,157.44 748.16,157.44V145.73C748.21,145.03 748.77,144.46 749.48,144.46H751.26C752.02,144.46 752.57,145.07 752.57,145.79ZM739.8,175.48C744.38,175.48 748.14,171.77 748.14,167.14C748.14,162.56 744.38,158.8 739.8,158.8C735.17,158.8 731.47,162.56 731.47,167.14C731.47,171.77 735.18,175.48 739.8,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M763.02,145.79V148.02C763.02,148.74 762.41,149.34 761.7,149.34H759.92C759.16,149.34 758.55,148.72 758.55,148.02V145.79C758.55,145.03 759.16,144.41 759.92,144.41H761.7C762.41,144.41 763.02,145.01 763.02,145.79ZM763.02,156V178.23C763.02,178.99 762.41,179.6 761.7,179.6H759.92C759.16,179.6 758.55,178.99 758.55,178.23V156C758.55,155.24 759.16,154.63 759.92,154.63H761.7C762.41,154.63 763.02,155.24 763.02,156Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M796.27,154.32C802.07,154.32 806.8,159.06 806.8,164.86V178.33C806.8,178.99 806.19,179.55 805.53,179.6H803.65C802.93,179.55 802.38,178.99 802.38,178.28V164.86C802.38,161.49 799.63,158.75 796.27,158.75C792.92,158.75 790.16,161.49 790.16,164.86V178.33C790.11,179.04 789.55,179.55 788.84,179.6H787.01C786.29,179.55 785.69,178.99 785.69,178.28V164.86C785.69,161.49 782.94,158.75 779.58,158.75C776.22,158.75 773.47,161.49 773.47,164.86V178.28C773.47,179 772.91,179.55 772.2,179.6H770.32C769.65,179.55 769.05,178.99 769.05,178.33V155.95C769.05,155.24 769.66,154.63 770.37,154.63H772.15C772.87,154.63 773.47,155.24 773.47,155.95V156.26C775.21,155.04 777.33,154.32 779.58,154.32C782.93,154.32 785.93,155.85 787.92,158.34H787.97C789.92,155.95 792.92,154.32 796.27,154.32Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M832.05,154.68H833.84C834.56,154.68 835.11,155.24 835.16,155.9V178.38C835.11,179.1 834.54,179.6 833.89,179.6H832.05C831.3,179.6 830.73,178.99 830.73,178.28V176.86C830.73,176.81 830.73,176.81 830.73,176.81V176.86C828.9,178.59 825.5,179.91 822.39,179.91C815.33,179.91 809.58,174.21 809.58,167.14C809.58,160.07 815.33,154.32 822.39,154.32C825.5,154.32 828.45,155.49 830.73,157.43V156C830.73,155.3 831.34,154.68 832.05,154.68ZM822.39,175.48C826.97,175.48 830.73,171.72 830.73,167.14C830.73,162.51 826.97,158.8 822.39,158.8C817.76,158.8 814.05,162.51 814.05,167.14C814.05,171.72 817.76,175.48 822.39,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M860.45,154.63H862.24C862.89,154.63 863.46,155.19 863.56,155.85V181.73C863.56,188.14 859.44,190.74 853.59,190.88C852.83,190.88 852.27,190.32 852.27,189.56V187.8C852.27,187.09 852.83,186.48 853.59,186.48C857,186.38 859.08,185.62 859.08,181.75V176.81C856.85,178.74 853.95,179.91 850.74,179.91C843.72,179.91 837.98,174.16 837.98,167.09C837.98,160.07 843.72,154.32 850.74,154.32C853.85,154.32 856.75,155.44 858.98,157.27C859.03,157.38 859.08,157.38 859.08,157.43L859.13,156C859.13,155.24 859.7,154.63 860.45,154.63ZM850.74,175.48C855.37,175.48 859.08,171.72 859.08,167.09C859.08,162.51 855.37,158.75 850.74,158.75C846.16,158.75 842.4,162.51 842.4,167.09C842.4,171.72 846.16,175.48 850.74,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M873.76,145.79V148.02C873.76,148.74 873.14,149.34 872.44,149.34H870.65C869.88,149.34 869.28,148.72 869.28,148.02V145.79C869.28,145.03 869.9,144.41 870.65,144.41H872.44C873.16,144.41 873.76,145.01 873.76,145.79ZM873.76,156V178.23C873.76,178.99 873.14,179.6 872.44,179.6H870.65C869.88,179.6 869.28,178.99 869.28,178.23V156C869.28,155.24 869.9,154.63 870.65,154.63H872.44C873.16,154.63 873.76,155.24 873.76,156Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M140.06,60.55C137.33,50.93 131.01,42.93 122.28,38.06C117.79,35.55 112.93,34.04 107.96,33.51C107.73,31.42 107.36,29.33 106.78,27.26C104.05,17.64 97.74,9.64 89,4.77C80.26,-0.11 70.15,-1.29 60.53,1.44C50.91,4.17 42.92,10.49 38.04,19.23C35.54,23.72 34.03,28.59 33.5,33.55C31.41,33.78 29.32,34.16 27.25,34.73C17.63,37.47 9.64,43.78 4.76,52.52C-0.11,61.26 -1.29,71.37 1.44,81C4.17,90.63 10.49,98.62 19.22,103.5C23.71,106 28.57,107.51 33.54,108.04C33.77,110.13 34.14,112.22 34.72,114.29C37.45,123.92 43.76,131.91 52.5,136.79C61.24,141.67 71.35,142.85 80.97,140.11C90.59,137.38 98.58,131.07 103.46,122.32C105.96,117.83 107.47,112.97 108,108C110.09,107.77 112.18,107.4 114.25,106.82C123.87,104.09 131.86,97.77 136.74,89.03C141.6,80.29 142.78,70.18 140.06,60.55ZM49.4,25.57C52.58,19.87 57.79,15.74 64.07,13.95C70.36,12.17 76.95,12.94 82.66,16.12C88.37,19.31 92.49,24.52 94.27,30.81C94.62,32.01 94.84,33.23 94.99,34.46C95.53,38.75 94.95,43.07 93.23,47.08C92.9,47.86 92.53,48.64 92.1,49.4C91.14,51.13 89.37,54.07 87.24,57.54C78.65,52.1 61.4,41.23 55.72,38.06C52.78,36.41 49.68,35.23 46.5,34.44C46.87,31.36 47.84,28.35 49.4,25.57ZM80.37,70.78C80.37,76.1 76.06,80.41 70.74,80.41C65.43,80.41 61.12,76.1 61.12,70.78C61.12,65.47 65.43,61.16 70.74,61.16C76.06,61.16 80.37,65.47 80.37,70.78ZM38.03,85.81C36.39,88.75 35.21,91.86 34.41,95.04C31.33,94.65 28.33,93.68 25.55,92.13C19.85,88.94 15.72,83.73 13.94,77.44C12.15,71.16 12.92,64.56 16.1,58.85C19.29,53.14 24.49,49.02 30.78,47.23C31.99,46.89 33.21,46.67 34.44,46.51C38.72,45.98 43.05,46.55 47.05,48.27C47.83,48.61 48.61,48.99 49.37,49.41C51.1,50.38 54.04,52.15 57.5,54.28C52.06,62.88 41.21,80.14 38.03,85.81ZM92.09,115.99C88.91,121.68 83.7,125.82 77.41,127.6C71.13,129.38 64.53,128.61 58.83,125.43C53.12,122.25 49,117.04 47.22,110.75C46.87,109.54 46.65,108.32 46.5,107.09C45.96,102.81 46.54,98.48 48.24,94.48C48.58,93.69 48.95,92.91 49.38,92.15C50.35,90.42 52.12,87.48 54.25,84.02C62.84,89.46 80.08,100.33 85.77,103.5C88.7,105.14 91.81,106.32 94.99,107.12C94.62,110.2 93.64,113.2 92.09,115.99ZM125.37,82.69C122.19,88.4 116.98,92.52 110.69,94.31C109.49,94.65 108.27,94.87 107.04,95.03C102.75,95.57 98.43,94.99 94.43,93.27C93.64,92.94 92.86,92.56 92.1,92.13C90.37,91.16 87.43,89.39 83.97,87.26C89.41,78.66 100.28,61.41 103.44,55.73C105.09,52.79 106.27,49.68 107.06,46.5C110.14,46.89 113.14,47.86 115.93,49.41C121.62,52.6 125.75,57.81 127.54,64.1C129.32,70.39 128.55,77 125.37,82.69Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M186.12,72.93C186.12,94.59 203.82,112.29 225.46,112.29C239.08,112.29 251.61,105.35 258.82,93.9C258.82,93.9 259.23,93.22 260.18,93.22C260.45,93.22 260.86,93.36 261.41,93.63L266.17,96.35C266.17,96.35 267.94,97.44 266.85,99.07C257.87,113.24 242.35,121.81 225.46,121.81C198.51,121.81 176.59,99.88 176.59,72.91C176.59,45.81 198.51,23.89 225.46,23.89C242.49,23.89 258.28,32.6 267.13,46.91C267.81,48.13 266.99,49.36 266.45,49.63L261.55,52.49C261.02,52.64 260.6,52.76 260.32,52.76C259.37,52.76 258.96,52.08 258.96,52.08C251.88,40.51 239.22,33.42 225.46,33.42C203.81,33.42 186.12,51.13 186.12,72.93Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M274.18,86.95C274.18,68.02 289.56,52.64 308.5,52.64C327.42,52.64 342.67,68.02 342.67,86.95C342.67,105.89 327.42,121.29 308.5,121.29C289.58,121.29 274.18,105.89 274.18,86.95ZM283.71,86.95C283.71,100.57 294.87,111.61 308.5,111.61C322.11,111.61 333.14,100.57 333.14,86.95C333.14,73.34 322.11,62.3 308.5,62.3C294.89,62.3 283.71,73.34 283.71,86.95Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M458.67,81.1V118.55C458.67,119.78 457.72,120.73 456.49,120.73H451.32C450.1,120.73 449.14,119.64 449.14,118.42V81.1C449.14,70.89 440.84,62.58 430.75,62.58C420.54,62.58 412.24,70.89 412.24,81.1V118.55C412.1,119.78 411.15,120.73 410.06,120.73H404.89C403.66,120.73 402.71,119.64 402.71,118.42V81.1C402.71,70.89 394.41,62.58 384.2,62.58C374.13,62.58 365.81,70.89 365.81,81.1V118.42C365.81,119.66 364.86,120.73 363.63,120.73H358.46C357.24,120.73 356.28,119.78 356.28,118.55V56.17C356.28,54.95 357.37,53.98 358.59,53.98H363.49C364.72,53.98 365.8,54.93 365.8,56.17V57.12C365.8,58.06 366.35,58.62 367.03,58.62C367.3,58.62 367.71,58.48 367.98,58.21C372.61,54.93 378.19,53.03 384.18,53.03C393.17,53.03 401.07,57.12 406.24,63.66C406.51,64.07 407.06,64.34 407.47,64.34C408.01,64.34 408.42,64.07 408.69,63.66C413.86,57.26 421.76,53.03 430.74,53.03C446.15,53.03 458.67,65.57 458.67,81.1Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M577.25,81.1V118.55C577.25,119.78 576.3,120.73 575.07,120.73H569.9C568.67,120.73 567.72,119.64 567.72,118.42V81.1C567.72,70.89 559.42,62.58 549.34,62.58C539.13,62.58 530.82,70.89 530.82,81.1V118.55C530.68,119.78 529.73,120.73 528.64,120.73H523.47C522.25,120.73 521.29,119.64 521.29,118.42V81.1C521.29,70.89 512.99,62.58 502.78,62.58C492.7,62.58 484.39,70.89 484.39,81.1V118.42C484.39,119.66 483.44,120.73 482.21,120.73H477.04C475.81,120.73 474.86,119.78 474.86,118.55V56.17C474.86,54.95 475.95,53.98 477.17,53.98H482.07C483.3,53.98 484.38,54.93 484.38,56.17V57.12C484.38,58.06 484.92,58.62 485.6,58.62C485.87,58.62 486.28,58.48 486.55,58.21C491.18,54.93 496.76,53.03 502.75,53.03C511.73,53.03 519.63,57.12 524.8,63.66C525.07,64.07 525.62,64.34 526.03,64.34C526.59,64.34 526.98,64.07 527.27,63.66C532.44,57.26 540.34,53.03 549.32,53.03C564.73,53.03 577.25,65.57 577.25,81.1Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M598.49,72.93C598.49,94.59 616.18,112.29 637.84,112.29C651.45,112.29 663.98,105.35 671.19,93.9C671.19,93.9 671.6,93.22 672.55,93.22C672.82,93.22 673.23,93.36 673.77,93.63L678.53,96.35C678.53,96.35 680.3,97.44 679.21,99.07C670.23,113.24 654.71,121.81 637.82,121.81C610.87,121.81 588.95,99.88 588.95,72.91C588.95,45.81 610.87,23.89 637.82,23.89C654.85,23.89 670.64,32.6 679.48,46.91C680.16,48.13 679.34,49.36 678.8,49.63L673.9,52.49C673.35,52.64 672.95,52.76 672.67,52.76C671.72,52.76 671.31,52.08 671.31,52.08C664.23,40.51 651.56,33.42 637.81,33.42C616.19,33.42 598.49,51.13 598.49,72.93Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M755.2,56.17V118.68C755.2,119.91 754.25,120.72 753.02,120.72H747.97C746.74,120.72 745.67,119.63 745.67,118.41C745.67,118.41 745.67,115.42 745.67,114.46C745.67,113.64 745.11,112.83 744.31,112.83C744.04,112.83 743.63,112.97 743.22,113.38C738.46,118.14 729.46,121.68 721.02,121.68C702.1,121.68 686.7,106.29 686.7,87.35C686.7,68.42 702.09,53.03 721.02,53.03C729.46,53.03 737.22,56.17 743.22,61.34C743.63,61.61 744.04,61.75 744.43,61.75C745.11,61.75 745.67,61.2 745.67,60.25C745.67,59.3 745.67,56.29 745.67,56.29C745.67,55.06 746.76,53.98 747.97,53.98H752.88C754.11,54 755.2,54.95 755.2,56.17ZM745.67,87.36C745.67,73.75 734.63,62.71 721.02,62.71C707.41,62.71 696.23,73.75 696.23,87.36C696.23,100.98 707.4,112.02 721.02,112.02C734.63,112.02 745.67,100.98 745.67,87.36Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M803.24,55.36V60.4C803.24,61.63 802.16,62.58 800.94,62.71C789.36,63.94 780.38,73.61 780.38,85.45V118.68C780.24,119.77 779.29,120.72 778.2,120.72H773.03C771.8,120.72 770.85,119.63 770.85,118.41V56.31C770.85,54.95 771.94,54 773.16,54H778.06C779.28,54 780.24,54.82 780.37,56.04V59.58C780.51,60.26 781.05,60.67 781.73,60.67C782.14,60.67 782.55,60.53 782.82,60.26C787.86,56.17 794.12,53.59 800.92,53.03C802.16,53.18 803.24,54.12 803.24,55.36Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M876.36,89.41C876.22,90.77 875.27,91.72 873.91,91.86H819.59C818.5,91.86 817.96,92.68 818.09,93.49C820.95,103.97 830.61,111.74 841.91,111.74C849.8,111.74 857.44,107.78 861.93,101.52C862.34,100.97 863.02,100.57 863.83,100.57C864.24,100.57 864.65,100.71 864.92,100.84L869.41,103.42C870.36,104.1 870.77,105.46 870.23,106.41C863.7,115.81 853.22,121.39 841.91,121.39C822.99,121.39 807.61,106 807.61,87.07C807.61,68.14 822.99,52.74 841.91,52.74C860.16,52.76 876.63,67.07 876.36,89.41ZM818.08,80.55C817.94,81.37 818.49,82.18 819.58,82.32H864.24C865.33,82.18 865.87,81.37 865.74,80.55C862.88,70.06 853.34,62.3 841.91,62.3C830.61,62.3 820.94,70.06 818.08,80.55Z"
+      android:fillColor="#5D70D2"/>
+</vector>
diff --git a/app/res/drawable/commcare_logo.png b/app/res/drawable/commcare_logo.png
deleted file mode 100644
index b3ec53544f..0000000000
Binary files a/app/res/drawable/commcare_logo.png and /dev/null differ
diff --git a/app/res/drawable/home_incomplete.xml b/app/res/drawable/home_incomplete.xml
index b7481fda92..394c4221bf 100644
--- a/app/res/drawable/home_incomplete.xml
+++ b/app/res/drawable/home_incomplete.xml
@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M219.8,93V58.1l-34.9,-34.8H80.3V93L57,139.5v69.8h186v-69.8L219.8,93zM80.3,119v20.5H70L80.3,119zM173.3,174.4h-46.5l-23.3,-34.9H91.8v-34.9V34.9H180l28.1,28v41.7v34.8h-11.6L173.3,174.4zM219.8,139.5V119l10.3,20.5H219.8zM161.6,58.1h-58.1V46.5h58.1V58.1zM131.2,81.4h-27.7V69.8h27.7V81.4z"
-        android:fillColor="#FFE3C2"/>
-    <path
-        android:pathData="M180.1,34.9l28.1,28v41.7v34.8h-11.6l-23.3,34.9h-46.5l-23.3,-34.9H91.8H80.2H70L80.3,119V93L57,139.5v69.8h186v-69.8L219.8,93V58.1l-34.9,-34.8M219.8,139.5V119l10.3,20.5H219.8z"
-        android:fillColor="#995324"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M122.98,58.67C126.89,47.53 137.52,39.56 150,39.56C162.48,39.56 173.11,47.53 177.02,58.67H188.22C198.76,58.67 207.33,67.24 207.33,77.78V173.33C207.33,183.87 198.76,192.44 188.22,192.44H111.78C101.24,192.44 92.67,183.87 92.67,173.33V77.78C92.67,67.24 101.24,58.67 111.78,58.67H122.98ZM156.76,61.47C154.96,59.68 152.53,58.67 150,58.67C147.47,58.67 145.04,59.68 143.24,61.47C141.45,63.26 140.45,65.69 140.45,68.22C140.45,70.76 141.45,73.19 143.24,74.98C145.04,76.77 147.47,77.78 150,77.78C152.53,77.78 154.96,76.77 156.76,74.98C158.55,73.19 159.55,70.76 159.55,68.22C159.55,65.69 158.55,63.26 156.76,61.47ZM116.27,104.74C114.92,106.08 114.17,107.91 114.17,109.81C114.17,111.71 114.92,113.53 116.27,114.88C117.61,116.22 119.43,116.97 121.33,116.97C123.24,116.97 125.06,116.22 126.4,114.88C127.75,113.53 128.5,111.71 128.5,109.81C128.5,107.91 127.75,106.08 126.4,104.74C125.06,103.4 123.24,102.64 121.33,102.64C119.43,102.64 117.61,103.4 116.27,104.74ZM183.44,105.03H145.22C142.6,105.03 140.45,107.18 140.45,109.81C140.45,112.44 142.6,114.59 145.22,114.59H183.44C186.07,114.59 188.22,112.44 188.22,109.81C188.22,107.18 186.07,105.03 183.44,105.03ZM192.51,153.83C192.51,164.38 183.96,172.94 173.4,172.94C162.85,172.94 154.29,164.38 154.29,153.83C154.29,143.27 162.85,134.72 173.4,134.72C183.96,134.72 192.51,143.27 192.51,153.83ZM175.19,146.07C175.19,145.07 174.39,144.27 173.4,144.27C172.41,144.27 171.61,145.07 171.61,146.07V154.43C171.61,155.42 172.41,156.22 173.4,156.22C174.39,156.22 175.19,155.42 175.19,154.43V146.07ZM173.4,163.38C174.72,163.38 175.79,162.32 175.79,161C175.79,159.68 174.72,158.61 173.4,158.61C172.08,158.61 171.01,159.68 171.01,161C171.01,162.32 172.08,163.38 173.4,163.38Z"
+      android:fillColor="@color/square_button_icon_color"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/res/drawable/home_logout.xml b/app/res/drawable/home_logout.xml
index 39e7ef5bf8..e448c752cb 100644
--- a/app/res/drawable/home_logout.xml
+++ b/app/res/drawable/home_logout.xml
@@ -1,15 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="210dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="210.0">
-    <path
-        android:pathData="M153.3,106.9l0,14.2l54.1,0l0,-14.2z"
-        android:fillColor="#D9D8D5"/>
-    <path
-        android:pathData="M234.5,114l-28.6,-21.4l0,42.8z"
-        android:fillColor="#D9D8D5"/>
-    <path
-        android:pathData="M176.8,164l-53.6,0l0,-100l53.6,0l0,28.6l14.3,0l0,-42.9l0,0l-82.2,0l0,128.6l82.2,0l0,-42.9l-14.3,0z"
-        android:fillColor="#D9D8D5"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M120.75,67.5C126.14,67.5 130.5,63.14 130.5,57.75C130.5,52.36 126.14,48 120.75,48H101.25C85.1,48 72,61.1 72,77.25V155.25C72,171.4 85.1,184.5 101.25,184.5H120.75C126.14,184.5 130.5,180.14 130.5,174.75C130.5,169.36 126.14,165 120.75,165H101.25C95.86,165 91.5,160.64 91.5,155.25V77.25C91.5,71.86 95.86,67.5 101.25,67.5H120.75ZM225.71,121.55C227.18,120.18 228,118.26 228,116.25C228,114.24 227.18,112.32 225.71,110.95L181.84,69.51C179.71,67.5 176.6,66.95 173.92,68.11C171.24,69.27 169.5,71.92 169.5,74.81V96.75H130.5C125.11,96.75 120.75,101.11 120.75,106.5V126C120.75,131.39 125.11,135.75 130.5,135.75H169.5V157.69C169.5,160.61 171.24,163.23 173.92,164.39C176.6,165.55 179.71,165 181.84,162.99L225.71,121.55Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_saved.xml b/app/res/drawable/home_saved.xml
index 80def3660e..d20a0f5b00 100644
--- a/app/res/drawable/home_saved.xml
+++ b/app/res/drawable/home_saved.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M219.8,93V58.1l-34.9,-34.8H80.3V93L57,139.5v69.8h186v-69.8L219.8,93zM80.3,119v20.5H70L80.3,119zM173.3,174.4h-46.5l-23.3,-34.9H91.8v-34.9V34.9H180l28.1,28v41.7v34.8h-11.6L173.3,174.4zM219.8,139.5V119l10.3,20.5H219.8zM161.6,58.1h-58.1V46.5h58.1V58.1zM184.9,81.4h-81.4V69.8h81.4V81.4zM103.5,93h93v11.7h-93V93zM103.5,116.3h93v11.7h-93V116.3z"
-        android:fillColor="#CFEBEF"/>
-    <path
-        android:pathData="M180.1,34.9l28.1,28v41.7v34.8h-11.6l-23.3,34.9h-46.5l-23.3,-34.9H91.8H80.2H70L80.3,119V93L57,139.5v69.8h186v-69.8L219.8,93V58.1l-34.9,-34.8M219.8,139.5V119l10.3,20.5H219.8z"
-        android:fillColor="#0F7A9A"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M94.21,38C81.96,38 72,48 72,60.3V171.78C72,184.07 81.96,194.07 94.21,194.07H205.29C217.54,194.07 227.5,184.07 227.5,171.78V87.23C227.5,81.3 225.17,75.62 221.01,71.44L194.18,44.51C190.01,40.33 184.36,38 178.46,38H94.21ZM94.21,71.44C94.21,65.28 99.18,60.3 105.32,60.3H171.96C178.11,60.3 183.07,65.28 183.07,71.44V93.74C183.07,99.91 178.11,104.89 171.96,104.89H105.32C99.18,104.89 94.21,99.91 94.21,93.74V71.44ZM149.75,171.78C137.5,171.78 127.54,161.78 127.54,149.48C127.54,137.18 137.5,127.18 149.75,127.18C162,127.18 171.96,137.18 171.96,149.48C171.96,161.78 162,171.78 149.75,171.78Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_start.xml b/app/res/drawable/home_start.xml
index 1241219c2b..044cc99479 100644
--- a/app/res/drawable/home_start.xml
+++ b/app/res/drawable/home_start.xml
@@ -1,9 +1,13 @@
-<vector android:autoMirrored="true" android:height="232dp"
-    android:viewportHeight="232.5" android:viewportWidth="300.0"
-    android:width="300dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#34843f" android:pathData="M127.12,94.55 L56.95,148.35L56.95,161.94l78.86,-60.56c-1.76,-2.22 -6.84,-8.32 -8.69,-6.84z"/>
-    <path android:fillColor="#34843f" android:pathData="M172.14,152.42 L114.27,197.07L129.52,197.07l50.66,-38.64c-1.76,-2.22 -6.19,-7.4 -8.04,-6.01z"/>
-    <path android:fillColor="#34843f" android:pathData="m194.33,181.36 l-20.34,15.72L189.62,197.07l12.76,-9.61c-1.76,-2.4 -6.19,-7.58 -8.04,-6.1z"/>
-    <path android:fillColor="#2c7238" android:pathData="m71.83,184.96c-0.46,-1.76 -1.39,-3.7 -1.2,-5.64L56.95,189.68l0,7.3l3.14,0c0.74,0 1.48,-0.18 2.03,-0.65l12.67,-9.71c-0.55,0 -0.65,0 -1.2,0 -1.02,0 -1.57,-0.65 -1.76,-1.66z"/>
-    <path android:fillColor="#d6eacd" android:pathData="m241.39,68.38c0.09,-0.09 0.18,-0.18 0.28,-0.37 1.85,-2.13 2.77,-4.44 2.96,-7.3 -0.28,-10.35 -12.85,-19.41 -22,-12.11L205.33,63.67c-5.18,4.44 -10.45,8.88 -15.72,13.41 -23.21,19.69 -46.32,39.38 -69.43,59.17 -6.56,5.64 -13.22,11.28 -19.88,16.92 -2.03,1.76 -3.61,3.61 -4.99,5.92 -2.5,4.07 -4.9,8.41 -6.66,12.85 -1.02,2.5 -2.68,6.01 -2.5,9.06 4.99,0 10.08,-0.74 14.98,-1.57 3.88,-0.65 8.69,-0.92 12.39,-2.4 2.03,-0.74 3.24,-1.76 4.81,-3.05 4.25,-3.61 8.6,-7.3 12.85,-11 30.97,-26.35 61.94,-52.79 92.82,-79.14z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <group>
+    <clip-path
+        android:pathData="M72,38h156v156h-156z"/>
+    <path
+        android:pathData="M215.69,44.61C209.02,37.94 198.23,37.94 191.56,44.61L182.39,53.75L212.22,83.58L221.39,74.41C228.06,67.74 228.06,56.95 221.39,50.28L215.69,44.61ZM124.53,111.64C122.67,113.5 121.24,115.79 120.42,118.32L111.4,145.37C110.51,147.99 111.21,150.89 113.16,152.87C115.11,154.85 118.01,155.52 120.66,154.63L147.71,145.62C150.21,144.76 152.5,143.36 154.39,141.5L205.36,90.5L175.5,60.64L124.53,111.64V111.64ZM101.25,57.5C85.1,57.5 72,70.6 72,86.75V164.75C72,180.9 85.1,194 101.25,194H179.25C195.4,194 208.5,180.9 208.5,164.75V135.5C208.5,130.11 204.14,125.75 198.75,125.75C193.36,125.75 189,130.11 189,135.5V164.75C189,170.14 184.64,174.5 179.25,174.5H101.25C95.86,174.5 91.5,170.14 91.5,164.75V86.75C91.5,81.36 95.86,77 101.25,77H130.5C135.89,77 140.25,72.64 140.25,67.25C140.25,61.86 135.89,57.5 130.5,57.5H101.25Z"
+        android:fillColor="@color/square_button_icon_color"/>
+  </group>
 </vector>
diff --git a/app/res/drawable/home_sync.xml b/app/res/drawable/home_sync.xml
index 07d6596a72..072a233b71 100644
--- a/app/res/drawable/home_sync.xml
+++ b/app/res/drawable/home_sync.xml
@@ -1,9 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="210dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="210.0">
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <group>
+    <clip-path
+        android:pathData="M72,47h156v138.67h-156z"/>
     <path
-        android:pathData="M162.5,82.6c0,-6.9 -5.6,-12.5 -12.5,-12.5c-6.9,0 -12.5,5.6 -12.5,12.5c0,5.1 3.1,9.5 7.5,11.5c-3.1,27.9 -14.4,54.4 -32.5,76.1c11.9,-5.6 24.7,-8.3 37.5,-8.3s25.6,2.8 37.5,8.3c-18.1,-21.7 -29.4,-48.2 -32.5,-76.1C159.4,92.1 162.5,87.7 162.5,82.6zM166.6,154.9c-5.5,-1 -11.1,-1.5 -16.7,-1.5c-5.6,0 -11.1,0.5 -16.7,1.5c7.5,-12.9 13.2,-26.9 16.7,-41.4C153.5,128.1 159.1,142 166.6,154.9zM122.9,57.5l8.8,8.8c-8.9,8.9 -8.9,23.5 0,32.4l-8.8,8.8C109,93.9 109,71.4 122.9,57.5zM114,116.5l-8.8,8.8c-11.4,-11.4 -17.7,-26.6 -17.7,-42.7s6.3,-31.3 17.7,-42.7l8.8,8.8c-9,9 -14,21.1 -14,33.9C100,95.4 104.9,107.5 114,116.5zM168.3,98.8c4.3,-4.3 6.7,-10.1 6.7,-16.2c0,-6.1 -2.4,-11.9 -6.7,-16.2l8.8,-8.8c6.7,6.7 10.4,15.6 10.4,25.1c0,9.4 -3.7,18.4 -10.4,25.1L168.3,98.8zM212.5,82.6c0,16.1 -6.3,31.3 -17.7,42.7l-8.8,-8.8c9,-9 14.1,-21.1 14.1,-33.9s-5,-24.9 -14.1,-33.9l8.8,-8.8C206.2,51.3 212.5,66.4 212.5,82.6z"
-        android:fillColor="#C1DFF5"/>
+        android:pathData="M88.95,47.62C84.51,45.84 79.47,47.97 77.66,52.42C74,61.46 72,71.35 72,81.67C72,91.99 74,101.87 77.66,110.92C79.45,115.36 84.51,117.5 88.95,115.71C93.4,113.92 95.54,108.86 93.75,104.42C90.9,97.4 89.33,89.74 89.33,81.67C89.33,73.6 90.9,65.93 93.75,58.92C95.54,54.47 93.4,49.44 88.95,47.62ZM211.05,47.62C206.6,49.44 204.46,54.47 206.25,58.92C209.1,65.93 210.67,73.6 210.67,81.67C210.67,89.74 209.1,97.4 206.25,104.42C204.46,108.86 206.6,113.9 211.05,115.71C215.49,117.53 220.52,115.36 222.34,110.92C226,101.87 228,91.99 228,81.67C228,71.35 226,61.46 222.34,52.42C220.52,47.97 215.49,45.84 211.05,47.62ZM164.11,91.74C166.14,88.9 167.33,85.43 167.33,81.67C167.33,72.11 159.56,64.33 150,64.33C140.44,64.33 132.67,72.11 132.67,81.67C132.67,85.43 133.86,88.9 135.89,91.74L98.79,173.43C96.81,177.79 98.73,182.93 103.09,184.91C107.45,186.88 112.6,184.96 114.57,180.6L120.13,168.33H179.87L185.45,180.57C187.43,184.93 192.57,186.86 196.93,184.88C201.3,182.9 203.22,177.76 201.24,173.4L164.11,91.74ZM171.99,151H128.01L131.93,142.33H168.07L171.99,151ZM150,102.6L160.18,125H139.82L150,102.6ZM116.23,66.93C117.66,63.66 116.17,59.81 112.87,58.37C109.57,56.94 105.75,58.43 104.31,61.73C101.66,67.85 100.17,74.6 100.17,81.67C100.17,88.74 101.66,95.48 104.31,101.6C105.75,104.88 109.59,106.39 112.87,104.96C116.15,103.52 117.66,99.68 116.23,96.4C114.25,91.9 113.17,86.92 113.17,81.67C113.17,76.41 114.25,71.43 116.23,66.93ZM195.69,61.73C194.25,58.46 190.41,56.94 187.13,58.37C183.85,59.81 182.34,63.66 183.77,66.93C185.75,71.43 186.83,76.41 186.83,81.67C186.83,86.92 185.75,91.9 183.77,96.4C182.34,99.68 183.83,103.52 187.13,104.96C190.43,106.39 194.25,104.9 195.69,101.6C198.34,95.48 199.83,88.74 199.83,81.67C199.83,74.6 198.34,67.85 195.69,61.73V61.73Z"
+        android:fillColor="@color/square_button_icon_color"/>
+  </group>
 </vector>
diff --git a/app/res/drawable/ic_cc_update.xml b/app/res/drawable/ic_cc_update.xml
new file mode 100644
index 0000000000..c2e6797bbc
--- /dev/null
+++ b/app/res/drawable/ic_cc_update.xml
@@ -0,0 +1,5 @@
+<vector android:height="25dp" android:viewportHeight="232.5"
+    android:viewportWidth="300" android:width="32.258064dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#9B9B9D" android:pathData="M150,156.3l37.5,-56.3l-18.8,0l0,-56.2l-37.4,0l0,56.2l-18.8,0z"/>
+    <path android:fillColor="#9B9B9D" android:pathData="M225,188.8l0,-56.3l-18.7,0l0,37.5l-112.6,0l0,-37.5l-18.7,0l0,56.3z"/>
+</vector>
diff --git a/app/res/drawable/icon_app_white.png b/app/res/drawable/icon_app_white.png
deleted file mode 100644
index b5da340312..0000000000
Binary files a/app/res/drawable/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable/icon_chevron_left_white.xml b/app/res/drawable/icon_chevron_left_white.xml
new file mode 100644
index 0000000000..da62f057f0
--- /dev/null
+++ b/app/res/drawable/icon_chevron_left_white.xml
@@ -0,0 +1,4 @@
+<vector android:height="12dp" android:viewportHeight="12.0"
+    android:viewportWidth="8.0" android:width="8dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M7.70492 1.41L6.29492 0L0.294922 6L6.29492 12L7.70492 10.59L3.12492 6L7.70492 1.41Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/res/drawable/icon_chevron_right_white.xml b/app/res/drawable/icon_chevron_right_white.xml
new file mode 100644
index 0000000000..e8d8ed9a60
--- /dev/null
+++ b/app/res/drawable/icon_chevron_right_white.xml
@@ -0,0 +1,4 @@
+<vector android:height="12dp" android:viewportHeight="12.0"
+    android:viewportWidth="8.0" android:width="8dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M1.70492 0L0.294922 1.41L4.87492 6L0.294922 10.59L1.70492 12L7.70492 6L1.70492 0Z"/>
+</vector>
diff --git a/app/res/drawable/icon_close_white.xml b/app/res/drawable/icon_close_white.xml
new file mode 100644
index 0000000000..e74616b87d
--- /dev/null
+++ b/app/res/drawable/icon_close_white.xml
@@ -0,0 +1,4 @@
+<vector android:height="14dp" android:viewportHeight="14.0"
+    android:viewportWidth="14.0" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 12.59L8.41 7L14 1.41Z"/>
+</vector>
diff --git a/app/res/drawable/icon_color.png b/app/res/drawable/icon_color.png
deleted file mode 100644
index 1e88bab4f5..0000000000
Binary files a/app/res/drawable/icon_color.png and /dev/null differ
diff --git a/app/res/drawable/incomplete_nav_drawer.xml b/app/res/drawable/incomplete_nav_drawer.xml
new file mode 100644
index 0000000000..9ce6fc5689
--- /dev/null
+++ b/app/res/drawable/incomplete_nav_drawer.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.6" android:height="100dp"
+    android:viewportHeight="100" android:viewportWidth="100"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#343434" android:pathData="m88.52,40.04v-0c-0.08,-0.14 -0.19,-0.26 -0.31,-0.35l-5.78,-4.34v-13.48c0,-0.65 -0.52,-1.17 -1.17,-1.17h-18.36l-12.19,-9.14c-0.02,-0.02 -0.04,-0.02 -0.06,-0.03v-0c-0.07,-0.04 -0.14,-0.07 -0.21,-0.1 -0.07,-0.03 -0.14,-0.05 -0.21,-0.07 -0.3,-0.04 -0.61,0.02 -0.86,0.18 -0.02,0.01 -0.04,0.02 -0.06,0.03l-12.19,9.14h-18.36c-0.65,0 -1.17,0.52 -1.17,1.17v13.48l-5.78,4.34c-0.13,0.09 -0.23,0.21 -0.31,0.35l-0,0.01 0,-0c-0.09,0.16 -0.13,0.34 -0.14,0.52 0,0.02 -0.02,0.04 -0.02,0.06v46.88c0,0.02 0,0.03 0.01,0.05 0,0.1 0.02,0.2 0.05,0.29l0,0.03c0.01,0.03 0.03,0.05 0.04,0.09l0,0c0.07,0.17 0.18,0.32 0.33,0.44 0.04,0.03 0.08,0.06 0.12,0.09 0.02,0.02 0.04,0.04 0.07,0.05 0.02,0.01 0.04,0 0.06,0.02v-0c0.16,0.08 0.32,0.12 0.5,0.13h75c0.17,-0 0.34,-0.05 0.5,-0.13 0.02,-0.01 0.04,-0 0.06,-0.02 0.02,-0.01 0.04,-0.04 0.07,-0.05v0c0.1,-0.06 0.18,-0.14 0.26,-0.23 0.08,-0.09 0.15,-0.19 0.19,-0.3 0.01,-0.03 0.04,-0.05 0.04,-0.09l0,-0.03h0c0.03,-0.1 0.04,-0.2 0.05,-0.29 0,-0.02 0.01,-0.03 0.01,-0.05v-46.88c0,-0.02 -0.02,-0.04 -0.02,-0.06 -0.01,-0.18 -0.05,-0.36 -0.14,-0.52zM80.08,35.94v7.66l-27.65,16.13 -1.72,-1.29c-0.42,-0.31 -0.99,-0.31 -1.41,0l-1.72,1.29 -27.65,-16.13v-20.55h60.16z"/>
+    <path android:fillColor="#343434" android:pathData="m26.95,31.25c0,0.65 0.52,1.17 1.17,1.17h43.75c0.65,0 1.17,-0.52 1.17,-1.17s-0.52,-1.17 -1.17,-1.17h-43.75c-0.65,0 -1.17,0.52 -1.17,1.17z"/>
+    <path android:fillColor="#343434" android:pathData="m71.88,36.33h-43.75c-0.65,0 -1.17,0.52 -1.17,1.17 0,0.64 0.52,1.17 1.17,1.17h43.75c0.65,0 1.17,-0.53 1.17,-1.17 0,-0.65 -0.52,-1.17 -1.17,-1.17z"/>
+    <path android:fillColor="#343434" android:pathData="m71.88,42.57h-43.75c-0.65,0 -1.17,0.53 -1.17,1.17 0,0.65 0.52,1.17 1.17,1.17h43.75c0.65,0 1.17,-0.52 1.17,-1.17 0,-0.64 -0.52,-1.17 -1.17,-1.17z"/>
+</vector>
diff --git a/app/res/drawable/install_start.xml b/app/res/drawable/install_start.xml
index 1b9ebaf11d..0e1a2a49f1 100644
--- a/app/res/drawable/install_start.xml
+++ b/app/res/drawable/install_start.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M238.1,74.1l-117.2,109.2l-0.8,-0.9l-23,-24.6l-34,-36.6l25.2,-23.4l34,36.4l91.9,-85.7z"
-        android:fillColor="#D6EACC"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M160,48.67C160,43.32 155.68,39 150.33,39C144.99,39 140.67,43.32 140.67,48.67V121.98L118.49,99.81C114.72,96.03 108.58,96.03 104.81,99.81C101.03,103.58 101.03,109.72 104.81,113.49L143.48,152.16C147.25,155.94 153.38,155.94 157.16,152.16L195.83,113.49C199.6,109.72 199.6,103.58 195.83,99.81C192.05,96.03 185.92,96.03 182.14,99.81L160,121.98V48.67ZM92.33,145.33C81.67,145.33 73,154 73,164.67V174.33C73,185 81.67,193.67 92.33,193.67H208.33C219,193.67 227.67,185 227.67,174.33V164.67C227.67,154 219,145.33 208.33,145.33H177.67L163.99,159.02C156.43,166.57 144.2,166.57 136.65,159.02L123,145.33H92.33ZM203.5,162.25C205.42,162.25 207.27,163.01 208.63,164.37C209.99,165.73 210.75,167.58 210.75,169.5C210.75,171.42 209.99,173.27 208.63,174.63C207.27,175.99 205.42,176.75 203.5,176.75C201.58,176.75 199.73,175.99 198.37,174.63C197.01,173.27 196.25,171.42 196.25,169.5C196.25,167.58 197.01,165.73 198.37,164.37C199.73,163.01 201.58,162.25 203.5,162.25Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/install_stop.xml b/app/res/drawable/install_stop.xml
index c5147ad783..af188dfb8d 100644
--- a/app/res/drawable/install_stop.xml
+++ b/app/res/drawable/install_stop.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M213.8,153.8l-38.4,-38.3l38.4,-38.2l-25.5,-25.5l-38.3,38.2l-38.2,-38.2l-25.5,25.5l38.2,38.2l-38.2,38.3l25.5,25.5l38.2,-38.3l38.3,38.3z"
-        android:fillColor="#D7D6D4"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M218.18,105.06H220.95C225.29,105.06 228.78,101.57 228.78,97.23V55.48C228.78,52.32 226.89,49.45 223.95,48.24C221.02,47.04 217.66,47.69 215.41,49.94L201.84,63.51C173.27,35.29 127.24,35.39 98.83,63.83C70.29,92.37 70.29,138.63 98.83,167.17C127.37,195.71 173.63,195.71 202.16,167.17C206.24,163.09 206.24,156.47 202.16,152.39C198.09,148.31 191.47,148.31 187.39,152.39C167,172.78 133.96,172.78 113.58,152.39C93.19,132 93.19,98.96 113.58,78.58C133.87,58.29 166.65,58.19 187.06,78.25L173.66,91.69C171.41,93.94 170.76,97.3 171.96,100.24C173.17,103.17 176.04,105.06 179.2,105.06H218.18Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/pause.png b/app/res/drawable/pause.png
index 3a23ef0186..54b1940c49 100644
Binary files a/app/res/drawable/pause.png and b/app/res/drawable/pause.png differ
diff --git a/app/res/drawable/play.png b/app/res/drawable/play.png
index 57c1e426cb..0ff12899ff 100644
Binary files a/app/res/drawable/play.png and b/app/res/drawable/play.png differ
diff --git a/app/res/drawable/progressbar_modern.xml b/app/res/drawable/progressbar_modern.xml
index 781e4be638..b47bd1c7c7 100644
--- a/app/res/drawable/progressbar_modern.xml
+++ b/app/res/drawable/progressbar_modern.xml
@@ -2,20 +2,22 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
+            <corners android:radius="@dimen/modern_progressbar_radius" />
             <gradient
-                android:startColor="@color/cc_neutral_bg"
-                android:endColor="@color/cc_neutral_bg"
+                android:startColor="@color/progress_bar_bg"
+                android:endColor="@color/progress_bar_bg"
                 />
         </shape>
     </item>
     <item android:id="@android:id/progress">
-        <clip>
+        <scale android:scaleWidth="100%">
             <shape>
+                <corners android:radius="@dimen/modern_progressbar_radius" />
                 <gradient
-                    android:startColor="@color/cc_brand_color"
-                    android:endColor="@color/cc_brand_color"
+                    android:startColor="@color/white"
+                    android:endColor="@color/white"
                     />
             </shape>
-        </clip>
+        </scale>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/res/drawable/progressbar_modern_blue.xml b/app/res/drawable/progressbar_modern_blue.xml
new file mode 100644
index 0000000000..4b226bbb79
--- /dev/null
+++ b/app/res/drawable/progressbar_modern_blue.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="@dimen/modern_progressbar_radius" />
+            <gradient
+                android:startColor="@color/progress_bar_bg"
+                android:endColor="@color/progress_bar_bg"
+                />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="@dimen/modern_progressbar_radius" />
+                <gradient
+                    android:startColor="@color/cc_brand_color"
+                    android:endColor="@color/cc_brand_color"
+                    />
+            </shape>
+        </scale>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/res/drawable/record.png b/app/res/drawable/record.png
index 92561ada60..5e3940cb1e 100644
Binary files a/app/res/drawable/record.png and b/app/res/drawable/record.png differ
diff --git a/app/res/drawable/record_add.png b/app/res/drawable/record_add.png
index a13f2f624b..478b569692 100644
Binary files a/app/res/drawable/record_add.png and b/app/res/drawable/record_add.png differ
diff --git a/app/res/drawable/record_in_progress.png b/app/res/drawable/record_in_progress.png
index 45ab7e1056..f221d17b5a 100644
Binary files a/app/res/drawable/record_in_progress.png and b/app/res/drawable/record_in_progress.png differ
diff --git a/app/res/drawable/record_start.png b/app/res/drawable/record_start.png
index ea6fd034c9..040e424214 100644
Binary files a/app/res/drawable/record_start.png and b/app/res/drawable/record_start.png differ
diff --git a/app/res/drawable/recording_trash.png b/app/res/drawable/recording_trash.png
index 6f522522b8..eda65ed533 100644
Binary files a/app/res/drawable/recording_trash.png and b/app/res/drawable/recording_trash.png differ
diff --git a/app/res/drawable/rounded_button_shape.xml b/app/res/drawable/rounded_button_shape.xml
new file mode 100644
index 0000000000..5bfcbec484
--- /dev/null
+++ b/app/res/drawable/rounded_button_shape.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"   >
+
+    <size
+        android:minHeight="@dimen/min_button_height">
+    </size>
+
+    <corners android:radius="@dimen/rounded_button_corner_radius"/>
+</shape>
\ No newline at end of file
diff --git a/app/res/drawable/startup_barcode.xml b/app/res/drawable/startup_barcode.xml
index 7b955103b1..ac3e33305c 100644
--- a/app/res/drawable/startup_barcode.xml
+++ b/app/res/drawable/startup_barcode.xml
@@ -1,78 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M131.4,96.9V59.8v-9.3H94.3H85v9.3v27.9V97h37.2L131.4,96.9L131.4,96.9zM94.3,87.6V59.8h27.8v27.9H94.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M103.6,69.1h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M159.3,69.1l-9.3,0l0,-9.3l9.3,0l0,-9.3l-9.3,0l-9.3,0l0,9.3l0,18.6l9.3,0l0,9.2l9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M150,115.5l9.3,0l0,-18.6l-9.3,0l0,-9.3l-9.3,0l0,18.6l9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M177.9,50.5h-9.3v46.4h9.3h27.9h9.3V59.8v-9.3H177.9zM205.7,87.6h-27.9V59.8h27.9V87.6L205.7,87.6z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M187.1,69.1h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M85,106.2l0,9.3l0,9.3l9.3,0l0,-9.3l9.3,0l0,-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M159.3,134.1l0,-9.3l-9.3,0l0,-9.3l-9.3,0l0,-9.3l-27.9,0l0,9.3l-9.2,0l0,9.3l18.6,0l0,-9.3l9.2,0l0,9.3l9.3,0l0,9.3l9.3,0l0,9.3l9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M168.6,161.9l9.3,0l0,-9.3l-9.3,0l0,-9.2l-9.3,0l0,9.2l-9.3,0l0,-9.2l-9.3,0l0,18.5l9.3,0l0,9.3l9.3,0l0,-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M177.9,143.4h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M168.6,134.1h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M168.6,124.8l9.3,0l0,9.3l9.2,0l0,9.3l9.3,0l0,-18.6l-9.3,0l0,-9.3l-9.2,0l0,-9.3l-9.3,0l0,9.3l-9.3,0l0,9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,124.8h9.3v18.6h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M187.1,106.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M196.4,115.5h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,106.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M196.4,143.4h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,152.6h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,171.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M187.1,161.9l-9.2,0l0,9.3l9.2,0l0,9.3l9.3,0l0,-27.9l-9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M159.3,171.2h18.6v9.3h-18.6z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M140.7,171.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M85,143.4v37.1h9.3h37.2v-9.3v-27.9V134H85V143.4zM122.2,143.4v27.9H94.3v-27.9H122.2z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M103.6,152.6h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M98.93,50.36C91.24,50.36 85,56.64 85,64.39V92.46C85,100.21 91.24,106.49 98.93,106.49H126.79C134.48,106.49 140.71,100.21 140.71,92.46V64.39C140.71,56.64 134.48,50.36 126.79,50.36H98.93ZM122.14,69.07V87.78H103.57V69.07H122.14ZM98.93,125.21C91.24,125.21 85,131.49 85,139.24V167.31C85,175.05 91.24,181.34 98.93,181.34H126.79C134.48,181.34 140.71,175.05 140.71,167.31V139.24C140.71,131.49 134.48,125.21 126.79,125.21H98.93ZM122.14,143.92V162.63H103.57V143.92H122.14ZM159.29,64.39V92.46C159.29,100.21 165.52,106.49 173.21,106.49H201.07C208.76,106.49 215,100.21 215,92.46V64.39C215,56.64 208.76,50.36 201.07,50.36H173.21C165.52,50.36 159.29,56.64 159.29,64.39ZM177.86,69.07H196.43V87.78H177.86V69.07ZM187.14,171.99V181.34H196.43V171.99H187.14ZM215,171.99H205.71V181.34H215V171.99ZM205.71,125.21V134.56H187.14V125.21H159.29V153.27V181.34H177.86V153.27H187.14V162.63H215V143.92V134.56V125.21H205.71Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/startup_url.xml b/app/res/drawable/startup_url.xml
index fa08e75f9f..9a04552800 100644
--- a/app/res/drawable/startup_url.xml
+++ b/app/res/drawable/startup_url.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M152.5,138.6l-58.1,-22.6L85,92.3l11.8,-30.4l22.2,-8l57.4,22.3l9.9,20.5L174.5,127L152.5,138.6zM102.6,108.2l49.1,19.1l16.2,-7.1l8.5,-22l-7.6,-13.8l-49.8,-19.4l-14.4,5.3l-8.5,22L102.6,108.2z"
-        android:fillColor="#CFEBEF"/>
-    <path
-        android:pathData="M126.2,128.4l-1.4,3.7l5.2,16.1l49.1,19.1l16,-7.9l8.5,-22l-7.4,-13.1L146.4,105l-13.1,5.1l-3.3,8.7l-11.2,-4.3l5.1,-13.2l23.1,-8.9l57.4,22.3l10.6,22L203.2,167l-23.4,11.6l-58.1,-22.6l-9.6,-24.5l2.9,-7.5L126.2,128.4z"
-        android:fillColor="#0A799A"/>
+    android:width="300dp"
+    android:height="232dp"
+    android:viewportWidth="300.0"
+    android:viewportHeight="232.5">
+
+    <path android:fillColor="@color/square_button_icon_color"
+        android:pathData="M205.88,118.88C218.04,106.55 218.04,86.58 205.88,74.24C195.13,63.33 178.18,61.91 165.81,70.88L165.47,71.12C162.37,73.37 161.66,77.74 163.87,80.86C166.09,83.98 170.39,84.72 173.47,82.47L173.81,82.23C180.72,77.24 190.16,78.02 196.14,84.11C202.92,90.99 202.92,102.12 196.14,108.99L172.01,133.53C165.23,140.4 154.26,140.4 147.48,133.53C141.48,127.44 140.71,117.86 145.63,110.87L145.87,110.52C148.09,107.38 147.35,103.01 144.28,100.79C141.2,98.56 136.88,99.28 134.68,102.4L134.45,102.75C125.58,115.28 126.98,132.48 137.74,143.39C149.89,155.73 169.57,155.73 181.73,143.39L205.88,118.88ZM94.12,113.77C81.96,126.11 81.96,146.08 94.12,158.41C104.87,169.32 121.82,170.74 134.19,161.77L134.53,161.53C137.63,159.28 138.34,154.92 136.13,151.8C133.91,148.68 129.61,147.93 126.53,150.18L126.19,150.42C119.28,155.42 109.84,154.63 103.86,148.54C97.08,141.65 97.08,130.51 103.86,123.64L128,99.13C134.77,92.25 145.74,92.25 152.52,99.13C158.52,105.22 159.29,114.8 154.37,121.81L154.13,122.15C151.91,125.3 152.65,129.66 155.72,131.89C158.8,134.12 163.12,133.4 165.32,130.27L165.55,129.93C174.41,117.38 173.02,100.18 162.26,89.26C150.11,76.93 130.43,76.93 118.27,89.26L94.12,113.77Z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_change_mode.xml b/app/res/drawable/wifi_direct_change_mode.xml
index c7cb385497..a735171ce4 100644
--- a/app/res/drawable/wifi_direct_change_mode.xml
+++ b/app/res/drawable/wifi_direct_change_mode.xml
@@ -5,6 +5,6 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_discover.xml b/app/res/drawable/wifi_direct_discover.xml
index 3a365e98e4..2b6ba5b485 100644
--- a/app/res/drawable/wifi_direct_discover.xml
+++ b/app/res/drawable/wifi_direct_discover.xml
@@ -5,9 +5,9 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M34.6,39c-0.9,0 -1.8,-0.4 -2.4,-1l-8,-8C18,33.9 9.9,33 4.6,27.8c-3,-2.9 -4.6,-6.8 -4.6,-11c0,-4.2 1.6,-8.2 4.6,-11.2c2.9,-3 6.8,-4.6 11,-4.6c4.2,0 8.2,1.6 11.2,4.6c0,0 0,0 0,0C32,10.9 32.9,19 29,25.1l8,8c0.6,0.6 1,1.5 1,2.4c0,0.9 -0.4,1.7 -1,2.4C36.4,38.6 35.6,39 34.6,39C34.7,39 34.6,39 34.6,39zM24.3,27.7c0.3,0 0.5,0.1 0.7,0.3l8.6,8.6c0.3,0.3 0.7,0.5 1,0.4c0.4,0 0.7,-0.2 0.9,-0.4c0.3,-0.3 0.4,-0.7 0.4,-1.1c0,-0.3 -0.1,-0.6 -0.4,-0.9L27,26c-0.3,-0.3 -0.4,-0.9 -0.1,-1.3c3.9,-5.4 3.2,-12.9 -1.5,-17.7c-2.6,-2.6 -6,-4 -9.7,-4c0,0 0,0 0,0C12,3 8.6,4.4 6,7c-2.6,2.6 -4,6.1 -4,9.7c0,3.6 1.4,7 4,9.6c4.8,4.8 12.2,5.4 17.7,1.5C23.9,27.7 24.1,27.7 24.3,27.7z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M15.7,28.6c-6.6,0 -11.9,-5.3 -11.9,-11.9S9.1,4.8 15.7,4.8s11.9,5.3 11.9,11.9S22.2,28.6 15.7,28.6zM15.7,6.8c-5.5,0 -9.9,4.4 -9.9,9.9s4.4,9.9 9.9,9.9s9.9,-4.4 9.9,-9.9S21.1,6.8 15.7,6.8z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_submit.xml b/app/res/drawable/wifi_direct_submit.xml
index 5a6ad4bf0c..22d10c7cc6 100644
--- a/app/res/drawable/wifi_direct_submit.xml
+++ b/app/res/drawable/wifi_direct_submit.xml
@@ -5,9 +5,9 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M10,12 L6,12 6,6 2,6 8,0 14,6 10,6z"/>
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="m0,11 l0,5 16,0 0,-5 -2,0 0,3 -12,0 0,-3z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_transfer.xml b/app/res/drawable/wifi_direct_transfer.xml
index 994c07960c..376611cdf8 100644
--- a/app/res/drawable/wifi_direct_transfer.xml
+++ b/app/res/drawable/wifi_direct_transfer.xml
@@ -5,6 +5,6 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M78.100006,84.400024c-1.8,0 -3.1,-1.4 -3.1,-3.1s1.4,-3.1 3.1,-3.1s3.1,1.4 3.1,3.1S79.899994,84.400024 78.100006,84.400024zM21.899994,84.400024c-1.8,0 -3.1,-1.4 -3.1,-3.1s1.4,-3.1 3.1,-3.1s3.1,1.4 3.1,3.1S23.600006,84.400024 21.899994,84.400024zM50,34.400024l0,9.4l-15.6,0c-3.1,0 -3.1,0 -3.1,3.1l0,6.2c0,3.1 0,3.1 3.1,3.1l15.6,0l0,9.4l17.2,-15.6L50,34.400024zM56.200012,31.200012l6.2,6.2l0,-15.6l31.2,0L93.60004,75l-31.2,0l0,-12.5l-6.2,6.2l0,15.6c0,3.1 0,3.1 3.1,3.1l37.5,0c3.1,0 3.1,0 3.1,-3.1l0,-68.8c0,-3.1 0,-3.1 -3.1,-3.1l-37.5,0c-3.1,0 -3.1,0 -3.1,3.1L56.200012,31.200012zM43.799988,37.5l0,-21.9c0,-3.1 0,-3.1 -3.1,-3.1l-37.5,0c-3.1,0 -3.1,0 -3.1,3.1l0,68.8c0,3.1 0,3.1 3.1,3.1l37.5,0c3.1,0 3.1,0 3.1,-3.1l0,-21.9l-6.2,0L37.599976,75l-31.2,0l0,-53.1l31.2,0l0,15.6L43.799988,37.5z"/>
 </vector>
diff --git a/app/res/layout-land/activity_crash_warning.xml b/app/res/layout-land/activity_crash_warning.xml
index 92bde2be99..60f0faecae 100644
--- a/app/res/layout-land/activity_crash_warning.xml
+++ b/app/res/layout-land/activity_crash_warning.xml
@@ -93,12 +93,10 @@
         </LinearLayout>
     </ScrollView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/RestartCommCare"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/content_min_margin"
-        android:background="@color/cc_brand_color"
-        android:textColor="@color/cc_neutral_bg"/>
+        android:layout_margin="@dimen/content_min_margin"/>
 </RelativeLayout>
diff --git a/app/res/layout-land/update_activity.xml b/app/res/layout-land/update_activity.xml
index c767b199fb..0a097bbbc2 100644
--- a/app/res/layout-land/update_activity.xml
+++ b/app/res/layout-land/update_activity.xml
@@ -62,7 +62,7 @@
             <ProgressBar
                 android:id="@+id/update_progress_bar"
                 style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-                android:progressDrawable="@drawable/progressbar_modern"
+                android:progressDrawable="@drawable/progressbar_modern_blue"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/content_min_margin"
diff --git a/app/res/layout/activity_crash_warning.xml b/app/res/layout/activity_crash_warning.xml
index 5b7206eff0..3695850f16 100644
--- a/app/res/layout/activity_crash_warning.xml
+++ b/app/res/layout/activity_crash_warning.xml
@@ -22,7 +22,7 @@
             android:paddingLeft="@dimen/content_min_margin"
             android:paddingTop="@dimen/content_min_margin"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/commcare_logo"
+            app:srcCompat="@drawable/commcare_by_dimagi"
             android:layout_marginEnd="@dimen/content_min_margin"
             android:paddingStart="@dimen/content_min_margin" />
 
@@ -108,12 +108,10 @@
         </LinearLayout>
     </LinearLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/RestartCommCare"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/content_min_margin"
-        android:background="@color/cc_brand_color"
-        android:textColor="@color/cc_neutral_bg"/>
+        android:layout_margin="@dimen/content_min_margin"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_drawing_boundary.xml b/app/res/layout/activity_drawing_boundary.xml
index 89f742fdee..426377a3ad 100644
--- a/app/res/layout/activity_drawing_boundary.xml
+++ b/app/res/layout/activity_drawing_boundary.xml
@@ -44,7 +44,7 @@
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             style="@style/MapButtonGreen"
             android:id="@+id/start_tracking_button"
             android:layout_height="wrap_content"
@@ -52,15 +52,15 @@
             android:visibility="gone"
             android:layout_width="0dp" />
 
-        <Button
-            style="@style/MapButtonRed"
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/stop_tracking_button"
+            style="@style/MapButtonRed"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:visibility="gone" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             style="@style/MapButtonOrange"
             android:id="@+id/redo_tracking_button"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             android:layout_width="0dp"
             android:visibility="gone" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             style="@style/MapButtonGreen"
             android:id="@+id/ok_tracking_button"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/activity_fullscreen_video_view.xml b/app/res/layout/activity_fullscreen_video_view.xml
new file mode 100644
index 0000000000..d40bccf689
--- /dev/null
+++ b/app/res/layout/activity_fullscreen_video_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <org.commcare.views.media.CommCareVideoView
+        android:id="@+id/fullscreen_video_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/activity_mapbox_location_picker.xml b/app/res/layout/activity_mapbox_location_picker.xml
index 62f4d970d6..74398bbd91 100644
--- a/app/res/layout/activity_mapbox_location_picker.xml
+++ b/app/res/layout/activity_mapbox_location_picker.xml
@@ -56,21 +56,19 @@
             android:maxLines="3"
             android:minLines="3" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/confirm_location_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:enabled="false"
-            style="@style/Commcare.Button.Primary"
             android:text="@string/confirm_location" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            style="@style/Commcare.Button.Primary"
             android:text="@string/cancel" />
 
     </LinearLayout>
diff --git a/app/res/layout/activity_report_problem.xml b/app/res/layout/activity_report_problem.xml
index d5b815a465..598eda0394 100644
--- a/app/res/layout/activity_report_problem.xml
+++ b/app/res/layout/activity_report_problem.xml
@@ -8,6 +8,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
+        android:layout_margin="16dp"
         android:layout_height="wrap_content">
 
         <ImageView
@@ -20,7 +21,7 @@
             android:paddingTop="@dimen/content_min_margin"
             android:scaleType="fitCenter"
             android:adjustViewBounds="true"
-            app:srcCompat="@drawable/commcare_logo"
+            app:srcCompat="@drawable/commcare_by_dimagi"
             android:layout_marginEnd="@dimen/content_min_margin"
             android:paddingStart="@dimen/content_min_margin"></ImageView>
 
@@ -46,7 +47,7 @@
             android:lines="5"
             android:textColor="@color/black"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/ReportButton01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/activity_target_mismatch_error.xml b/app/res/layout/activity_target_mismatch_error.xml
index 92e6e71e06..028f6c2be7 100644
--- a/app/res/layout/activity_target_mismatch_error.xml
+++ b/app/res/layout/activity_target_mismatch_error.xml
@@ -38,8 +38,9 @@
             tools:text="In order to install CommCare LTS, Please click on install button below. Then try installing your app again."/>
     </LinearLayout>
 
-    <Button
-        style="@style/PromptedUpdateButtonUpdateLater"
+    <com.google.android.material.button.MaterialButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_spacer_large"
         android:layout_below="@+id/error_info_container"
         android:id="@+id/install_app_button"
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
index 5811cdbdc3..5b0fd33b04 100644
--- a/app/res/layout/app_manager.xml
+++ b/app/res/layout/app_manager.xml
@@ -10,7 +10,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:paddingTop="@dimen/activity_vertical_margin"
+        android:padding="@dimen/activity_vertical_margin"
         android:id="@+id/screen_manager_banner_pane">
 
         <ImageView
@@ -18,7 +18,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitStart"
-            app:srcCompat="@drawable/commcare_logo"
+            app:srcCompat="@drawable/commcare_by_dimagi"
             android:adjustViewBounds="true"/>
 
     </FrameLayout>
@@ -36,13 +36,14 @@
         android:layout_centerHorizontal="true"
         android:gravity="center"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/install_app_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_below="@id/manager_instructions"
         android:layout_marginTop="@dimen/standard_spacer"
+        android:textSize="@dimen/font_size_xlarge"
         android:paddingHorizontal="@dimen/standard_spacer_double"
         android:onClick="installAppClicked"
         android:text="@string/install_app" />
diff --git a/app/res/layout/blank_missing_multimedia_layout.xml b/app/res/layout/blank_missing_multimedia_layout.xml
index dc44bfd6f1..f156e89344 100644
--- a/app/res/layout/blank_missing_multimedia_layout.xml
+++ b/app/res/layout/blank_missing_multimedia_layout.xml
@@ -16,13 +16,13 @@
         android:scaleType="fitStart"
         android:maxHeight="135px"
         android:maxWidth="663px"
-        app:srcCompat="@drawable/ccbanner"
+        app:srcCompat="@drawable/commcare_by_dimagi"
         android:visibility="gone"
         android:layout_marginEnd="20px"
         android:paddingStart="20px">
     </ImageView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
         android:layout_above="@+id/screen_multimedia_retry"
         android:visibility="gone" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/blue_outlined_button.xml b/app/res/layout/blue_outlined_button.xml
index 31afd53836..82d3dca59d 100644
--- a/app/res/layout/blue_outlined_button.xml
+++ b/app/res/layout/blue_outlined_button.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/NegativeButtonStyle"
+    app:strokeColor="@color/cc_brand_color"
     android:id="@+id/blue_outlined_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="right"
-    android:textColor="@color/blue"
+    android:layout_gravity="end"
     android:visibility="gone"
-    style="@style/CommCare.Button.Default"
-    android:background="@drawable/blue_outlined_view"
     android:padding="10dp"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    tools:viewBindingIgnore="true" />
diff --git a/app/res/layout/choice_dialog_view.xml b/app/res/layout/choice_dialog_view.xml
index d4020842d5..6664567254 100644
--- a/app/res/layout/choice_dialog_view.xml
+++ b/app/res/layout/choice_dialog_view.xml
@@ -25,19 +25,18 @@
         android:layout_marginEnd="@dimen/standard_spacer_large">
     </ListView>
 
-    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+    <com.google.android.material.button.MaterialButton
+        style="@style/NegativeButtonStyle"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        app:strokeColor="@color/cc_brand_color"
             android:id="@+id/optional_button"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/min_button_height"
             android:padding="@dimen/standard_spacer"
             android:layout_gravity="end"
             android:layout_marginRight="@dimen/standard_spacer"
-            android:background="@android:color/transparent"
-            android:textSize="@dimen/font_size_dp_medium"
-            android:textColor="@color/dialog_button_color"
             android:visibility="gone"
-        android:layout_marginEnd="@dimen/standard_spacer">
-    </Button>
+        android:layout_marginEnd="@dimen/standard_spacer"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/res/layout/component_entity_detail_item.xml b/app/res/layout/component_entity_detail_item.xml
index 9d83e2da4b..abc4c8edee 100644
--- a/app/res/layout/component_entity_detail_item.xml
+++ b/app/res/layout/component_entity_detail_item.xml
@@ -41,7 +41,7 @@
             android:visibility="visible"
             android:layout_marginEnd="8dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/detail_value_phone"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                 android:drawablePadding="@dimen/content_min_margin"
                 android:text="Callout"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/callout_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -146,7 +146,7 @@
             android:paddingStart="11dp"
             android:paddingEnd="4dp">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/detail_address_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/app/res/layout/connection_diagnostic.xml b/app/res/layout/connection_diagnostic.xml
index d94b34f28c..189a92ed72 100644
--- a/app/res/layout/connection_diagnostic.xml
+++ b/app/res/layout/connection_diagnostic.xml
@@ -16,17 +16,11 @@
         <ImageView
             android:id="@+id/screen_bulk_image1"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="20dp"
-            android:maxHeight="135dp"
-            android:maxWidth="663dp"
-            android:paddingBottom="0dp"
-            android:paddingLeft="20dp"
-            android:paddingTop="20dp"
+            android:layout_height="120dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ccbanner"
-            android:paddingStart="20dp"
-            android:layout_marginEnd="20dp" />
+            android:padding="16dp"
+            app:srcCompat="@drawable/commcare_by_dimagi"
+            />
 
         <TextView
             android:id="@+id/connection_test_prompt"
@@ -45,10 +39,10 @@
             android:paddingStart="5dp"
             android:paddingEnd="5dp">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/run_connection_test"
-                style="@style/ButtonBottom"
                 android:layout_width="match_parent"
+                android:layout_margin="10dp"
                 android:layout_height="wrap_content"
                 android:text="Run Connection Test"/>
 
@@ -64,17 +58,15 @@
             android:text="Output message."
             android:visibility="invisible"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/settings_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Go to Settings"
             android:visibility="invisible"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/report_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Report to CommCare"
diff --git a/app/res/layout/custom_alert_dialog.xml b/app/res/layout/custom_alert_dialog.xml
index cc2ccd9d57..ff67065491 100755
--- a/app/res/layout/custom_alert_dialog.xml
+++ b/app/res/layout/custom_alert_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,6 +50,17 @@
                     android:textColor="@color/cc_attention_negative_text"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
+                <CheckBox
+                    android:id="@+id/dialog_checkbox"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/emphasized_message"
+                    android:focusable="true"
+                    android:visibility="gone"
+                    android:textSize="@dimen/font_size_dp_large"
+                    android:layout_marginTop="@dimen/standard_spacer_double">
+                </CheckBox>
+
             </RelativeLayout>
 
         </ScrollView>
@@ -60,50 +71,38 @@
             android:layout_weight="2"
             android:layout_marginBottom="@dimen/standard_spacer">
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/positive_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="@dimen/standard_spacer"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
+            <com.google.android.material.button.MaterialButton
+                app:strokeColor="@color/cc_brand_color"
+                android:id="@+id/positive_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                android:visibility="gone"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/standard_spacer">
-            </Button>
+                android:layout_marginEnd="@dimen/standard_spacer"
+                android:layout_marginStart="@dimen/standard_spacer"/>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/neutral_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_toLeftOf="@id/positive_button"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
-                android:layout_toStartOf="@id/positive_button">
-            </Button>
+            <com.google.android.material.button.MaterialButton
+                app:strokeColor="@color/cc_brand_color"
+                android:id="@+id/neutral_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                android:layout_marginEnd="@dimen/standard_spacer"
+                android:visibility="gone"
+                android:layout_toStartOf="@id/positive_button"/>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/negative_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_toLeftOf="@id/neutral_button"
-                    android:layout_marginRight="@dimen/standard_spacer"
-                    android:layout_marginLeft="@dimen/standard_spacer"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
+            <com.google.android.material.button.MaterialButton
+                style="@style/NegativeButtonStyle"
+                android:id="@+id/negative_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                app:strokeColor="@color/cc_brand_color"
+                android:visibility="gone"
                 android:layout_marginStart="@dimen/standard_spacer"
                 android:layout_marginEnd="@dimen/standard_spacer"
-                android:layout_toStartOf="@id/neutral_button">
-            </Button>
+                android:layout_toStartOf="@id/neutral_button"/>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/dots_detail.xml b/app/res/layout/dots_detail.xml
index f29952483e..9d1bb02a12 100644
--- a/app/res/layout/dots_detail.xml
+++ b/app/res/layout/dots_detail.xml
@@ -40,18 +40,18 @@
         android:id="@+id/dotsbuttonframe"
         android:weightSum="1">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:text="Save Details"
             android:id="@+id/btn_dots_detail_ok"
-            android:layout_weight="0.5"></Button>
+            android:layout_weight="0.5"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/btn_dots_detail_cancel"
             android:text="Cancel"
-            android:layout_weight="0.5"></Button>
+            android:layout_weight="0.5"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/res/layout/dotsdoses.xml b/app/res/layout/dotsdoses.xml
index c11b044085..2a84d168db 100644
--- a/app/res/layout/dotsdoses.xml
+++ b/app/res/layout/dotsdoses.xml
@@ -61,10 +61,10 @@
             android:id="@+id/dots_dose_four"></TableRow>
     </TableLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:id="@+id/btn_dots_doses_done"
         android:text="Done"
-        android:layout_alignParentBottom="true"></Button>
+        android:layout_alignParentBottom="true"/>
 </RelativeLayout>
diff --git a/app/res/layout/draw_layout.xml b/app/res/layout/draw_layout.xml
index 203a239874..3a49edaf24 100644
--- a/app/res/layout/draw_layout.xml
+++ b/app/res/layout/draw_layout.xml
@@ -17,9 +17,10 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
         android:layout_alignParentBottom="true">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnFinishDraw"
             android:layout_width="wrap_content"
             android:enabled="false"
@@ -31,12 +32,13 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnResetDraw"
                 android:layout_width="wrap_content"
+                android:layout_marginHorizontal="16dp"
                 android:layout_height="wrap_content"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnCancelDraw"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
diff --git a/app/res/layout/entity_detail.xml b/app/res/layout/entity_detail.xml
index 38458c1a22..4fb1ae5d46 100644
--- a/app/res/layout/entity_detail.xml
+++ b/app/res/layout/entity_detail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/entity_detail"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -9,8 +10,12 @@
     tools:viewBindingIgnore="true">
 
     <Button
-        android:id="@+id/entity_select_button"
         style="@style/ScreenPinnedButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        app:backgroundTint="@color/cc_attention_positive_bg"
+        android:textColor="@color/cc_attention_positive_text"
+        android:id="@+id/entity_select_button"
         android:text="Continue"
         android:layout_below="@+id/universal_frame_tile"/>
 
diff --git a/app/res/layout/execute_recovery_measures.xml b/app/res/layout/execute_recovery_measures.xml
index 74ff5fa5c8..963deebbf1 100644
--- a/app/res/layout/execute_recovery_measures.xml
+++ b/app/res/layout/execute_recovery_measures.xml
@@ -17,9 +17,9 @@
         <ImageView
             android:id="@+id/screen_login_top_banner"
             android:layout_centerHorizontal="true"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            app:srcCompat="@drawable/icon_color"/>
+            android:layout_height="136dp"
+            android:layout_width="136dp"
+            app:srcCompat="@mipmap/commcare_launcher"/>
 
         <TextView
             android:gravity="center"
@@ -53,7 +53,7 @@
             android:visibility="gone"
             tools:text="2 out of 5 done"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/retry_button"
             android:layout_below="@id/status_tv"
             android:layout_centerHorizontal="true"
@@ -63,7 +63,7 @@
             android:text="@string/recovery_measure_retry"
             android:visibility="gone"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/reinstall_button"
             android:layout_below="@id/retry_button"
             android:layout_centerHorizontal="true"
@@ -73,7 +73,7 @@
             android:text="@string/recovery_measure_reinstall"
             android:visibility="gone"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/select_ccz_button"
             android:layout_below="@id/reinstall_button"
             android:layout_centerHorizontal="true"
diff --git a/app/res/layout/fragment_setup_enter_url.xml b/app/res/layout/fragment_setup_enter_url.xml
index 969d497871..c0f2f8faa0 100644
--- a/app/res/layout/fragment_setup_enter_url.xml
+++ b/app/res/layout/fragment_setup_enter_url.xml
@@ -65,7 +65,7 @@
                     </EditText>
                 </LinearLayout>
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/start_install"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
diff --git a/app/res/layout/geo_progress.xml b/app/res/layout/geo_progress.xml
index 2fe494c747..ebccab0453 100644
--- a/app/res/layout/geo_progress.xml
+++ b/app/res/layout/geo_progress.xml
@@ -51,7 +51,7 @@
         android:orientation="horizontal"
         android:layout_weight="1">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/geoOK"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             android:text="Record Location"
             android:layout_margin="@dimen/standard_spacer"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/geoCancel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/geopoint_layout.xml b/app/res/layout/geopoint_layout.xml
index b763e71d20..06bd8b0f49 100644
--- a/app/res/layout/geopoint_layout.xml
+++ b/app/res/layout/geopoint_layout.xml
@@ -33,7 +33,7 @@
             android:paddingBottom="2dip"
             android:paddingTop="2dip">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/show_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
@@ -41,14 +41,14 @@
                 android:text="@string/go_to_location"
                 android:visibility="gone"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/accept_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:text="@string/accept_location" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/cancel_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
diff --git a/app/res/layout/grid_header_top_banner.xml b/app/res/layout/grid_header_top_banner.xml
index 722acccd98..fe4810acc5 100644
--- a/app/res/layout/grid_header_top_banner.xml
+++ b/app/res/layout/grid_header_top_banner.xml
@@ -19,7 +19,7 @@
         android:paddingLeft="@dimen/standard_spacer"
         android:paddingRight="@dimen/standard_spacer"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/commcare_logo"
+        app:srcCompat="@drawable/commcare_by_dimagi"
         android:visibility="visible"
         android:paddingStart="@dimen/standard_spacer"
         android:paddingEnd="@dimen/standard_spacer" />
diff --git a/app/res/layout/hierarchy_layout.xml b/app/res/layout/hierarchy_layout.xml
index 5b459716b6..6c6d3ff375 100644
--- a/app/res/layout/hierarchy_layout.xml
+++ b/app/res/layout/hierarchy_layout.xml
@@ -46,10 +46,10 @@ the License.
             android:layout_height="wrap_content"
             android:text="@string/jump_to_previous"
             android:padding="12dp"
-            android:textSize="@dimen/text_medium"
             android:textColor="@color/cc_brand_color"
             android:background="@color/cc_core_bg"
             style="@style/CommCare.Button.Default"
+            android:textSize="@dimen/text_medium"
             android:layout_weight="1"/>
 
         <Button
diff --git a/app/res/layout/http_request_layout.xml b/app/res/layout/http_request_layout.xml
index 44cd60fc01..7b8a9e100e 100644
--- a/app/res/layout/http_request_layout.xml
+++ b/app/res/layout/http_request_layout.xml
@@ -38,16 +38,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/request_button"
-                style="@style/ButtonBottom"
+                android:layout_margin="10dp"
                 android:layout_width="wrap_content"
                 android:layout_gravity="center"
                 android:layout_height="wrap_content"
-                android:background="@color/cc_brand_color"
                 android:paddingBottom="@dimen/content_start"
-                android:paddingTop="@dimen/content_start"
-                android:textColor="@color/cc_neutral_bg"/>
+                android:paddingTop="@dimen/content_start" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/install_confirm_fragment.xml b/app/res/layout/install_confirm_fragment.xml
index 9074e446ff..e72045dc7a 100644
--- a/app/res/layout/install_confirm_fragment.xml
+++ b/app/res/layout/install_confirm_fragment.xml
@@ -25,24 +25,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/screen_first_start_banner"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="@dimen/content_min_margin"
-                    android:layout_marginEnd="@dimen/content_start"
-                    android:layout_marginRight="@dimen/content_start"
-                    android:adjustViewBounds="true"
-                    android:paddingBottom="@dimen/content_start"
-                    android:paddingLeft="@dimen/content_start"
-                    android:paddingRight="@dimen/content_start"
-                    android:paddingTop="@dimen/content_start"
-                    android:scaleType="fitCenter"
-                    app:srcCompat="@drawable/commcare_logo"
-                    android:paddingEnd="@dimen/content_start"
-                    android:paddingStart="@dimen/content_start" />
+                <include layout="@layout/grid_header_top_banner"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -92,7 +75,7 @@
                                 android:id="@+id/btn_start_install"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                SquareButtonWithText:backgroundColor="@color/cc_attention_positive_color"
+                                SquareButtonWithText:backgroundColor="@color/start_home_button"
                                 SquareButtonWithText:img="@drawable/install_start"
                                 SquareButtonWithText:subtitle="Start install"
                                 SquareButtonWithText:textColor="@color/white"
@@ -112,8 +95,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
                                 android:gravity="end"
-
-                                SquareButtonWithText:backgroundColor="@color/cc_neutral_color"
+                                SquareButtonWithText:backgroundColor="@color/start_logout_button"
                                 SquareButtonWithText:img="@drawable/install_stop"
                                 SquareButtonWithText:subtitle="Start over"
                                 SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/layout/install_permission_requester.xml b/app/res/layout/install_permission_requester.xml
index 138276605d..9415ebdbc0 100644
--- a/app/res/layout/install_permission_requester.xml
+++ b/app/res/layout/install_permission_requester.xml
@@ -52,16 +52,14 @@
                 android:layout_marginStart="@dimen/content_min_margin"
                 android:layout_marginEnd="@dimen/content_min_margin" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/get_perms_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:background="@color/cc_brand_color"
                 android:nextFocusUp="@+id/edit_password"
                 android:paddingBottom="@dimen/content_start"
-                android:paddingTop="@dimen/content_start"
-                android:textColor="@color/cc_neutral_bg"/>
+                android:paddingTop="@dimen/content_start" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/layout_note_msg.xml b/app/res/layout/layout_note_msg.xml
index 7ba15d9060..535d0726eb 100644
--- a/app/res/layout/layout_note_msg.xml
+++ b/app/res/layout/layout_note_msg.xml
@@ -42,7 +42,7 @@
         android:text="What to do about it"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/layout_note_msg_action_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/list_gregorian_widget.xml b/app/res/layout/list_gregorian_widget.xml
index 4aa5816ebf..08b04e69ee 100644
--- a/app/res/layout/list_gregorian_widget.xml
+++ b/app/res/layout/list_gregorian_widget.xml
@@ -51,8 +51,9 @@
                 android:text="+"
                 android:textSize="@dimen/text_largest"
                 android:textColor="@color/white"
+                android:background="@drawable/date_button_top"
                 style="@style/CommCare.Button.Default"
-                android:background="@color/bright_blue_grad_start"
+                android:backgroundTint="@color/cc_brand_color"
                 android:elevation="@dimen/button_elevation"/>
 
             <EditText
@@ -74,8 +75,9 @@
                 android:text="-"
                 android:textSize="@dimen/text_largest"
                 style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:textColor="@color/white"
-                android:background="@color/dark_blue"
+                android:background="@drawable/date_button_bottom"
                 android:elevation="@dimen/button_elevation" />
 
         </LinearLayout>
@@ -96,9 +98,10 @@
                 android:layout_marginLeft="5dp"
                 android:text="+"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
                 android:textColor="@color/white"
-                android:background="@color/bright_blue_grad_start"
+                style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
+                android:background="@drawable/date_button_top"
                 android:elevation="@dimen/button_elevation"
                 android:layout_marginStart="5dp" />
 
@@ -115,10 +118,11 @@
                 android:layout_marginLeft="5dp"
                 android:text="-"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
+                android:background="@drawable/date_button_bottom"
                 android:textColor="@color/white"
-                android:background="@color/dark_blue"
                 android:elevation="@dimen/button_elevation"
+                style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:layout_marginStart="5dp" />
 
         </LinearLayout>
@@ -138,10 +142,11 @@
                 android:layout_marginLeft="5dp"
                 android:text="+"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
+                android:background="@drawable/date_button_top"
                 android:textColor="@color/white"
-                android:background="@color/bright_blue_grad_start"
                 android:elevation="@dimen/button_elevation"
+                style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:layout_marginStart="5dp" />
 
             <EditText
@@ -154,7 +159,6 @@
                 android:textSize="@dimen/text_medium"
                 android:inputType="number"
                 android:maxLength="4"
-                android:elevation="@dimen/button_elevation"
                 android:selectAllOnFocus="true"
                 android:imeOptions="flagNoExtractUi"
                 android:layout_marginStart="5dp" />
@@ -167,8 +171,9 @@
                 android:text="-"
                 android:textSize="@dimen/text_largest"
                 style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:textColor="@color/white"
-                android:background="@color/dark_blue"
+                android:background="@drawable/date_button_bottom"
                 android:elevation="@dimen/button_elevation"
                 android:layout_marginStart="5dp" />
         </LinearLayout>
diff --git a/app/res/layout/missing_multimedia_layout.xml b/app/res/layout/missing_multimedia_layout.xml
index dbb39efe03..196c5a6906 100644
--- a/app/res/layout/missing_multimedia_layout.xml
+++ b/app/res/layout/missing_multimedia_layout.xml
@@ -16,12 +16,12 @@
         android:scaleType="fitStart"
         android:maxHeight="135px"
         android:maxWidth="663px"
-        app:srcCompat="@drawable/ccbanner"
+        app:srcCompat="@drawable/commcare_by_dimagi"
         android:paddingStart="20px"
         android:layout_marginEnd="20px">
     </ImageView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         android:layout_above="@+id/screen_multimedia_retry"
         android:visibility="gone"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/multiple_apps_limit_view.xml b/app/res/layout/multiple_apps_limit_view.xml
index fe3d3d9925..298e470339 100644
--- a/app/res/layout/multiple_apps_limit_view.xml
+++ b/app/res/layout/multiple_apps_limit_view.xml
@@ -14,7 +14,7 @@
         android:layout_centerInParent="true"
         android:gravity="center"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/back_to_manager_button"
diff --git a/app/res/layout/nav_drawer_item_view.xml b/app/res/layout/nav_drawer_item_view.xml
index f70bc52b81..2adf708954 100644
--- a/app/res/layout/nav_drawer_item_view.xml
+++ b/app/res/layout/nav_drawer_item_view.xml
@@ -10,19 +10,22 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:orientation="horizontal" >
+        android:orientation="horizontal"
+        android:weightSum="5">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:id="@+id/drawer_icon"
             android:layout_marginRight="@dimen/standard_spacer_double"
-            android:layout_marginEnd="@dimen/standard_spacer_double" />
+            android:layout_marginEnd="@dimen/standard_spacer_double"
+            android:layout_weight="1"/>
 
         <TextView
             android:id="@+id/drawer_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="4"/>
 
     </LinearLayout>
 
diff --git a/app/res/layout/pin_screen_buttons.xml b/app/res/layout/pin_screen_buttons.xml
index 9df7a359fd..ac72c48bef 100644
--- a/app/res/layout/pin_screen_buttons.xml
+++ b/app/res/layout/pin_screen_buttons.xml
@@ -8,14 +8,17 @@
     android:weightSum="2"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_cancel_button"
         android:textSize="@dimen/font_size_dp_medium"
         android:layout_weight="1"/>
 
-    <Button
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_confirm_button"
diff --git a/app/res/layout/privilege_claiming_view.xml b/app/res/layout/privilege_claiming_view.xml
index 32c46f041c..a6229e221f 100644
--- a/app/res/layout/privilege_claiming_view.xml
+++ b/app/res/layout/privilege_claiming_view.xml
@@ -50,7 +50,7 @@
         android:layout_marginStart="@dimen/standard_spacer_double"
         android:layout_marginEnd="@dimen/standard_spacer_double" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/claim_button"
diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
index 4284e7a09c..4f4bcf7790 100644
--- a/app/res/layout/progress_dialog_cancel_button.xml
+++ b/app/res/layout/progress_dialog_cancel_button.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/NegativeButtonStyle"
+    app:strokeColor="@color/cc_brand_color"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/min_button_height"
     android:layout_below="@+id/main_content_holder"
@@ -9,10 +12,7 @@
     android:layout_marginEnd="@dimen/standard_spacer_large"
     android:layout_marginRight="@dimen/standard_spacer_large"
     android:layout_marginBottom="@dimen/standard_spacer"
-    android:background="@android:color/transparent"
     android:padding="@dimen/standard_spacer"
-    style="@style/CommCare.Button.Default"
     android:text="STOP"
-    android:textSize="@dimen/font_size_dp_medium"
-    android:visibility="gone"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    android:visibility="visible"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/app/res/layout/progress_dialog_determinate.xml b/app/res/layout/progress_dialog_determinate.xml
index 5aca287558..35a0d32140 100644
--- a/app/res/layout/progress_dialog_determinate.xml
+++ b/app/res/layout/progress_dialog_determinate.xml
@@ -34,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/progress_dialog_message"
-            android:progressDrawable="@drawable/progressbar_modern"
+            android:progressDrawable="@drawable/progressbar_modern_blue"
             android:indeterminate="false"
             android:indeterminateOnly="false"/>
 
diff --git a/app/res/layout/prompt_view.xml b/app/res/layout/prompt_view.xml
index 614a771256..c37e339d07 100644
--- a/app/res/layout/prompt_view.xml
+++ b/app/res/layout/prompt_view.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -36,9 +37,13 @@
                 android:layout_margin="@dimen/standard_spacer_double"
                 android:gravity="center"/>
 
-            <Button
-                android:id="@+id/action_button"
-                style="@style/PromptedUpdateButtonUpdate" />
+            <com.google.android.material.button.MaterialButton
+                android:layout_height="wrap_content"
+                app:backgroundTint="@color/solid_green"
+                android:textSize="@dimen/font_size_xlargest"
+                android:layout_margin="16dp"
+                android:layout_width="wrap_content"
+                android:id="@+id/action_button"/>
 
             <ImageView
                 android:id="@+id/image_cue"
@@ -46,9 +51,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/standard_spacer_double"/>
 
-            <Button
-                android:id="@+id/do_later_button"
-                style="@style/PromptedUpdateButtonUpdateLater"/>
+            <com.google.android.material.button.MaterialButton
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/font_size_xlarge"
+                android:layout_margin="16dp"
+                android:layout_width="wrap_content"
+                android:paddingHorizontal="24dp"
+                android:id="@+id/do_later_button" />
 
             <TextView
                 android:id="@+id/help_text"
diff --git a/app/res/layout/recording.xml b/app/res/layout/recording.xml
index c79de6c9eb..9e8b03022f 100644
--- a/app/res/layout/recording.xml
+++ b/app/res/layout/recording.xml
@@ -9,7 +9,7 @@
     android:layout_marginTop="10dp"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id = "@+id/startrecording"/>
@@ -23,7 +23,7 @@
         android:id = "@+id/recordingprogress"
         android:background="@color/blue"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/stoprecording"/>
diff --git a/app/res/layout/recording_fragment.xml b/app/res/layout/recording_fragment.xml
index b43b1e2fff..16c2b4b3d3 100644
--- a/app/res/layout/recording_fragment.xml
+++ b/app/res/layout/recording_fragment.xml
@@ -68,9 +68,8 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/action_button"
-        style="@style/Commcare.Button.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
diff --git a/app/res/layout/screen_form_dump.xml b/app/res/layout/screen_form_dump.xml
index 426e8deac2..6a465c61ac 100644
--- a/app/res/layout/screen_form_dump.xml
+++ b/app/res/layout/screen_form_dump.xml
@@ -15,16 +15,16 @@
             android:id="@+id/screen_bulk_image1"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
-            android:paddingLeft="20px"
-            android:layout_marginRight="20px"
-            android:paddingTop="20px"
-            android:paddingBottom="0px"
+            android:paddingLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="0dp"
             android:scaleType="fitStart"
-            android:maxHeight="135px"
-            android:maxWidth="663px"
-            app:srcCompat="@drawable/ccbanner"
-            android:layout_marginEnd="20px"
-            android:paddingStart="20px"></ImageView>
+            android:maxHeight="83dp"
+            android:maxWidth="442dp"
+            app:srcCompat="@drawable/commcare_by_dimagi"
+            android:layout_marginEnd="8dp"
+            android:paddingStart="8dp"></ImageView>
 
         <RelativeLayout
             android:id="@+id/screen_bulk_form_frame_location"
@@ -43,20 +43,19 @@
                 android:layout_centerHorizontal="true"
                 android:layout_margin="10dp"
                 android:gravity="center"
-                android:layout_below="@+id/screen_multimedia_inflater_filefetch"
                 android:text="From here you can dump your forms to an SD card or submit the forms on your SD card"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/screen_bulk_form_dump"
-                style="@style/ButtonBottom"
                 android:layout_width="match_parent"
+                android:layout_margin="10dp"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_prompt"
                 android:text="Dump Forms"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/screen_bulk_form_submit"
-                style="@style/ButtonBottom"
+                android:layout_margin="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_dump"
diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml
index 654f1bcff1..c5869f1f51 100644
--- a/app/res/layout/screen_form_entry.xml
+++ b/app/res/layout/screen_form_entry.xml
@@ -56,7 +56,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/nav_badge"
-        android:background="@color/cc_core_bg"
+        android:background="@color/barcode_button_color"
         android:minHeight="@dimen/new_progressbar_minheight"
         android:paddingLeft="@dimen/content_start"
         android:paddingRight="@dimen/content_start"
@@ -70,40 +70,39 @@
             android:id="@+id/nav_btn_prev"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_alignParentLeft="true"
             android:background="@drawable/selector_button_press"
             android:minHeight="@dimen/new_progressbar_button_minheight"
             android:minWidth="@dimen/new_progressbar_button_minwidth"
             android:paddingLeft="@dimen/content_start"
             android:paddingRight="@dimen/new_progressbar_button_padding"
-            app:srcCompat="@drawable/icon_chevron_left_brand"
+            app:srcCompat="@drawable/icon_chevron_left_white"
             android:paddingStart="@dimen/content_start"
             android:layout_alignParentStart="true"
             android:paddingEnd="@dimen/new_progressbar_button_padding" />
 
         <ProgressBar
-            android:id="@+id/nav_prog_bar"
             style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/nav_btn_prev"
-            android:layout_alignParentTop="true"
-            android:layout_centerInParent="true"
+            android:id="@+id/nav_prog_bar"
+            android:indeterminate="false"
+            android:indeterminateOnly="false"
+            android:layout_centerVertical="true"
+            android:layout_height="32dp"
+            android:layout_marginEnd="@dimen/content_start"
             android:layout_marginLeft="@dimen/content_start"
             android:layout_marginRight="@dimen/content_start"
+            android:layout_marginStart="@dimen/content_start"
+            android:layout_toEndOf="@id/nav_btn_prev"
             android:layout_toLeftOf="@+id/nav_btn_next"
             android:layout_toRightOf="@id/nav_btn_prev"
-            android:indeterminate="false"
-            android:indeterminateOnly="false"
+            android:layout_toStartOf="@+id/nav_btn_next"
+            android:layout_width="wrap_content"
             android:max="100"
             android:paddingBottom="@dimen/content_start"
             android:paddingTop="@dimen/content_start"
             android:progress="0"
-            android:progressDrawable="@drawable/progressbar_modern"
-            android:layout_marginStart="@dimen/content_start"
-            android:layout_marginEnd="@dimen/content_start"
-            android:layout_toStartOf="@+id/nav_btn_next"
-            android:layout_toEndOf="@id/nav_btn_prev" />
+            android:progressDrawable="@drawable/progressbar_modern" />
 
         <ImageButton
             android:rotationY="@integer/locale_mirror_flip"
@@ -111,12 +110,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
             android:background="@drawable/selector_button_press"
             android:minHeight="@dimen/new_progressbar_button_minheight"
             android:minWidth="@dimen/new_progressbar_button_minwidth"
             android:paddingLeft="@dimen/new_progressbar_button_padding"
             android:paddingRight="@dimen/content_start"
-            app:srcCompat="@drawable/icon_chevron_right_brand"
+            app:srcCompat="@drawable/icon_chevron_right_white"
             android:paddingEnd="@dimen/content_start"
             android:paddingStart="@dimen/new_progressbar_button_padding"
             android:layout_alignParentEnd="true" />
@@ -237,11 +237,16 @@
         android:layout_height="wrap_content"
         android:id="@+id/multiple_intent_dispatch_pane"
         android:layout_above="@+id/screen_form_entry_bottom_anchor">
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/multiple_intent_dispatch_button"
             android:text="Batch Dispatch"
+            android:drawableRight="@drawable/icon_chevron_right_brand"
             android:visibility="gone"
-            style="@style/ScreenPinnedButtonNeutral"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/cc_light_cool_accent_bg"
+            android:textColor="@color/cc_light_cool_accent_text"
+           />
     </FrameLayout>
 
     <View
diff --git a/app/res/layout/screen_login.xml b/app/res/layout/screen_login.xml
index 2f2c7791f1..1f6604303b 100644
--- a/app/res/layout/screen_login.xml
+++ b/app/res/layout/screen_login.xml
@@ -166,14 +166,14 @@
                                 android:textSize="@dimen/font_size_medium"
                                 android:visibility="gone" />
 
-                            <Button
+                            <com.google.android.material.button.MaterialButton
                                 android:id="@+id/login_button"
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="bottom"
+                                android:textAllCaps="true"
                                 android:nextFocusUp="@+id/edit_password"
-                                android:paddingBottom="@dimen/content_start"
-                                android:paddingTop="@dimen/content_start" />
+                               />
 
                             <LinearLayout
                                 android:id="@+id/screen_login_error_view"
@@ -203,7 +203,6 @@
                                         android:id="@+id/btn_view_notifications"
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/rectangle_button_height"
-
                                         RectangleButtonWithText:backgroundColor="@color/cc_attention_negative_bg"
                                         RectangleButtonWithText:img="@drawable/ic_list_error"
                                         RectangleButtonWithText:textColor="@color/cc_attention_negative_text" />
diff --git a/app/res/layout/screen_multimedia_inflater.xml b/app/res/layout/screen_multimedia_inflater.xml
index c5afe131c7..9b85c391d2 100644
--- a/app/res/layout/screen_multimedia_inflater.xml
+++ b/app/res/layout/screen_multimedia_inflater.xml
@@ -53,14 +53,13 @@
         android:layout_below="@id/screen_multimedia_inflater_frame_location"
         android:layout_centerHorizontal="true"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/screen_multimedia_inflater_install"
-        style="@style/ButtonBottom"
         android:layout_width="match_parent"
+        android:layout_margin="10dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_gravity="bottom"
-        android:paddingBottom="@dimen/content_start"
-        android:paddingTop="@dimen/content_start" />
+        android:paddingVertical="8dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/screen_permission_request.xml b/app/res/layout/screen_permission_request.xml
index 6cc1f74851..af7a534696 100644
--- a/app/res/layout/screen_permission_request.xml
+++ b/app/res/layout/screen_permission_request.xml
@@ -33,13 +33,13 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/screen_permission_request_button_grant"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="Grant Access"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/screen_permission_request_button_deny"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/screen_recovery.xml b/app/res/layout/screen_recovery.xml
index 62903b8099..a7c11b9028 100644
--- a/app/res/layout/screen_recovery.xml
+++ b/app/res/layout/screen_recovery.xml
@@ -38,7 +38,7 @@
         android:visibility="gone"
         tools:text="Waiting"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/retry_button"
         android:layout_below="@id/recovery_status"
         android:layout_centerHorizontal="true"
@@ -48,7 +48,7 @@
         android:text="@string/recovery_retry"
         android:visibility="gone"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/app_manager_button"
         android:layout_below="@id/retry_button"
         android:layout_centerHorizontal="true"
diff --git a/app/res/layout/screen_seat_app.xml b/app/res/layout/screen_seat_app.xml
index ddb386c647..14532e6489 100644
--- a/app/res/layout/screen_seat_app.xml
+++ b/app/res/layout/screen_seat_app.xml
@@ -10,9 +10,9 @@
 
     <ImageView
         android:id="@+id/screen_login_top_banner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/icon_color"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        app:srcCompat="@mipmap/commcare_launcher"
         android:layout_centerHorizontal="true"/>
 
     <TextView
diff --git a/app/res/layout/scrolling_calendar_widget.xml b/app/res/layout/scrolling_calendar_widget.xml
index 4572612807..50dd850c02 100644
--- a/app/res/layout/scrolling_calendar_widget.xml
+++ b/app/res/layout/scrolling_calendar_widget.xml
@@ -134,12 +134,10 @@
             android:layout_centerVertical="true"
             android:layout_alignParentStart="true" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/lightest_grey"
             android:text="Today"
-            android:textStyle="bold"
             android:id="@+id/today"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/standard_spacer"
diff --git a/app/res/layout/select_install_mode_fragment.xml b/app/res/layout/select_install_mode_fragment.xml
index f5adb50624..8bb3c51d39 100644
--- a/app/res/layout/select_install_mode_fragment.xml
+++ b/app/res/layout/select_install_mode_fragment.xml
@@ -72,7 +72,7 @@
                             android:id="@+id/btn_fetch_uri"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            SquareButtonWithText:backgroundColor="@color/cc_brand_color"
+                            SquareButtonWithText:backgroundColor="@color/barcode_button_color"
                             SquareButtonWithText:img="@drawable/startup_barcode"
                             SquareButtonWithText:subtitle="Scan Application Barcode"
                             SquareButtonWithText:textColor="@color/white"/>
@@ -92,7 +92,7 @@
                             android:layout_height="match_parent"
                             android:background="@drawable/tile_drop_shadow_small_margins"
                             android:gravity="end"
-                            SquareButtonWithText:backgroundColor="@color/cc_light_cool_accent_color"
+                            SquareButtonWithText:backgroundColor="@color/barcode_button_color"
                             SquareButtonWithText:img="@drawable/startup_url"
                             SquareButtonWithText:subtitle="Enter Code"
                             SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/layout/single_app_view.xml b/app/res/layout/single_app_view.xml
index e0d38e1613..35c5669a52 100644
--- a/app/res/layout/single_app_view.xml
+++ b/app/res/layout/single_app_view.xml
@@ -36,7 +36,7 @@
         style="@style/TextAppearance.AppCompat.Body2"
         android:visibility="visible"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/uninstall_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -44,7 +44,7 @@
         android:onClick="rebootAlertDialog"
         android:text="@string/uninstall_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/archive_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -52,7 +52,7 @@
         android:onClick="toggleArchiveClicked"
         android:text="@string/archive_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/update_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -60,7 +60,7 @@
         android:onClick="updateClicked"
         android:text="@string/update_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:clickable="true"
         android:id="@+id/verify_button"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/single_dialog_choice_view.xml b/app/res/layout/single_dialog_choice_view.xml
index 0c9564f332..dce5e6a628 100644
--- a/app/res/layout/single_dialog_choice_view.xml
+++ b/app/res/layout/single_dialog_choice_view.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/choice_dialog_panel"
-    style="@style/CommCare.Button.Default"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/standard_spacer"
+    style="@style/CommCare.Button.Default"
     android:background="@drawable/selector_button_press"
     android:drawablePadding="5dp"
     android:padding="12dp"
diff --git a/app/res/layout/square_button_text.xml b/app/res/layout/square_button_text.xml
index a32331de54..55a44eac64 100644
--- a/app/res/layout/square_button_text.xml
+++ b/app/res/layout/square_button_text.xml
@@ -26,8 +26,8 @@
         android:paddingBottom="@dimen/standard_spacer"
         android:paddingLeft="@dimen/standard_spacer"
         android:paddingRight="@dimen/standard_spacer"
-        android:textSize="@dimen/font_size_large"
-        app:text_size_small="@dimen/font_size_medium"
+        android:textSize="@dimen/font_size_xlarge"
+        app:text_size_small="@dimen/font_size_large"
         android:paddingStart="@dimen/standard_spacer"
         android:paddingEnd="@dimen/standard_spacer" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/square_card.xml b/app/res/layout/square_card.xml
index 2c3e711671..f7143ad13d 100644
--- a/app/res/layout/square_card.xml
+++ b/app/res/layout/square_card.xml
@@ -23,8 +23,8 @@
             android:id="@+id/card"
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
 
             <org.commcare.views.SquareImageView
                 android:id="@+id/card_image"
@@ -41,8 +41,8 @@
                 android:paddingBottom="@dimen/standard_spacer"
                 android:paddingLeft="@dimen/standard_spacer"
                 android:paddingRight="@dimen/standard_spacer"
-                android:textSize="@dimen/font_size_large"
-                app:text_size_small="@dimen/font_size_medium"
+                android:textSize="@dimen/font_size_xlarge"
+                app:text_size_small="@dimen/font_size_large"
                 android:paddingStart="@dimen/standard_spacer"
                 android:paddingEnd="@dimen/standard_spacer" />
         </RelativeLayout>
@@ -54,6 +54,6 @@
             android:layout_below="@+id/card"
             android:layout_gravity="end"
             android:padding="@dimen/help_text_padding"
-            android:textSize="@dimen/font_size_small"/>
+            android:textSize="@dimen/font_size_medium"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/res/layout/universal_date_widget.xml b/app/res/layout/universal_date_widget.xml
index de0db435e1..60cd47798b 100644
--- a/app/res/layout/universal_date_widget.xml
+++ b/app/res/layout/universal_date_widget.xml
@@ -17,6 +17,9 @@
             android:id="@+id/dayupbtn"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:background="@drawable/date_button_top"
             android:text="+"
             android:textSize="@dimen/text_largest"/>
@@ -37,6 +40,9 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/daytxt"
             android:background="@drawable/date_button_bottom"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:text="-"
             android:textSize="@dimen/text_largest"/>
 
@@ -49,6 +55,9 @@
             android:background="@drawable/date_button_top"
             android:text="+"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/dayupbtn"
             android:layout_marginStart="5dp" />
 
@@ -76,6 +85,9 @@
             android:background="@drawable/date_button_bottom"
             android:text="-"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/daydownbtn"
             android:layout_marginStart="5dp" />
 
@@ -88,6 +100,9 @@
             android:background="@drawable/date_button_top"
             android:text="+"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/monthupbtn"
             android:layout_marginStart="5dp" />
 
@@ -115,6 +130,9 @@
             android:background="@drawable/date_button_bottom"
             android:text="-"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/monthdownbtn"
             android:layout_marginStart="5dp" />
     </RelativeLayout>
diff --git a/app/res/layout/update_activity.xml b/app/res/layout/update_activity.xml
index 7b0830dd16..a69d31f7f1 100644
--- a/app/res/layout/update_activity.xml
+++ b/app/res/layout/update_activity.xml
@@ -62,7 +62,7 @@
             android:layout_marginLeft="@dimen/content_min_margin"
             android:layout_marginRight="@dimen/content_min_margin"
             android:gravity="center"
-            android:progressDrawable="@drawable/progressbar_modern"
+            android:progressDrawable="@drawable/progressbar_modern_blue"
             android:layout_marginStart="@dimen/content_min_margin"
             android:layout_marginEnd="@dimen/content_min_margin" />
 
@@ -95,7 +95,7 @@
                 android:id="@+id/check_for_update_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                SquareButtonWithText:backgroundColor="@color/cc_brand_color"
+                SquareButtonWithText:backgroundColor="@color/start_home_button"
                 SquareButtonWithText:img="@drawable/check_update"
                 SquareButtonWithText:subtitle=""
                 SquareButtonWithText:textColor="@color/white"/>
@@ -104,7 +104,7 @@
                 android:id="@+id/stop_update_download_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                SquareButtonWithText:backgroundColor="@color/cc_neutral_color"
+                SquareButtonWithText:backgroundColor="@color/start_logout_button"
                 SquareButtonWithText:img="@drawable/install_stop"
                 SquareButtonWithText:subtitle=""
                 SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/layout/user_get_available_apps.xml b/app/res/layout/user_get_available_apps.xml
index 47ca892f31..f11acf2442 100644
--- a/app/res/layout/user_get_available_apps.xml
+++ b/app/res/layout/user_get_available_apps.xml
@@ -134,12 +134,12 @@
                     android:layout_marginStart="@dimen/standard_spacer_large"
                     android:layout_marginEnd="@dimen/standard_spacer_large" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/get_apps_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/see_available_apps"
-                    android:paddingHorizontal="@dimen/standard_spacer_double"
+                    android:paddingHorizontal="@dimen/standard_spacer_large"
                     android:layout_marginTop="@dimen/standard_spacer_double" />
 
                 <TextView
diff --git a/app/res/layout/wifi_direct_main.xml b/app/res/layout/wifi_direct_main.xml
index c5b6f3aa0a..e71981d97e 100644
--- a/app/res/layout/wifi_direct_main.xml
+++ b/app/res/layout/wifi_direct_main.xml
@@ -98,11 +98,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/send"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/cc_attention_positive_color"
+                    SquareButtonWithText:backgroundColor="@color/start_home_button"
                     SquareButtonWithText:img="@drawable/wifi_direct_transfer"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -110,11 +110,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/discover"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/cc_light_cool_accent_color"
+                    SquareButtonWithText:backgroundColor="@color/start_save_button"
                     SquareButtonWithText:img="@drawable/wifi_direct_discover"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -122,11 +122,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/submit"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/solid_dark_orange"
+                    SquareButtonWithText:backgroundColor="@color/cc_dark_warm_accent_color"
                     SquareButtonWithText:img="@drawable/wifi_direct_submit"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -134,11 +134,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/mode"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/cc_brand_text"
+                    SquareButtonWithText:backgroundColor="@color/cc_brand_color"
                     SquareButtonWithText:img="@drawable/wifi_direct_change_mode"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/mipmap-hdpi/commcare_launcher.png b/app/res/mipmap-hdpi/commcare_launcher.png
index 6c39f72697..55a8654128 100644
Binary files a/app/res/mipmap-hdpi/commcare_launcher.png and b/app/res/mipmap-hdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-mdpi/commcare_launcher.png b/app/res/mipmap-mdpi/commcare_launcher.png
index 18df9e517c..a7f590c5eb 100644
Binary files a/app/res/mipmap-mdpi/commcare_launcher.png and b/app/res/mipmap-mdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-xhdpi/commcare_launcher.png b/app/res/mipmap-xhdpi/commcare_launcher.png
index 5595298461..f83465e907 100644
Binary files a/app/res/mipmap-xhdpi/commcare_launcher.png and b/app/res/mipmap-xhdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-xxhdpi/commcare_launcher.png b/app/res/mipmap-xxhdpi/commcare_launcher.png
index 14b748b3b6..7da4e7f1e5 100644
Binary files a/app/res/mipmap-xxhdpi/commcare_launcher.png and b/app/res/mipmap-xxhdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-xxxhdpi/commcare_launcher.png b/app/res/mipmap-xxxhdpi/commcare_launcher.png
index e6bd659643..303765cd0a 100644
Binary files a/app/res/mipmap-xxxhdpi/commcare_launcher.png and b/app/res/mipmap-xxxhdpi/commcare_launcher.png differ
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 5f9214660f..d9e7aa88b9 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -61,6 +61,7 @@
     <color name="very_light_blue">#AAE3ECFF</color>
     <color name="solid_dark_red">#BF3D3D</color>
     <color name="solid_dark_orange">#F57E20</color>
+    <color name="red_incomplete">#E44434</color>
 
     <color name="dark_brown">#5C4033</color>
 
@@ -78,7 +79,7 @@
     <color name="cc_core_text">#181715</color>
 
     <!-- Brand -->
-    <color name="cc_brand_color">#004EBC</color>
+    <color name="cc_brand_color">#5D70D2</color>
     <color name="cc_brand_bg">#BCDEFF</color>
     <color name="cc_brand_text">#002C5F</color>
 
@@ -108,7 +109,7 @@
     <color name="cc_light_cool_accent_text">#00799A</color>
 
     <!-- Dark Warm Accent -->
-    <color name="cc_dark_warm_accent_color">#FF8400</color>
+    <color name="cc_dark_warm_accent_color">#FEAF31</color>
     <color name="cc_dark_warm_accent_bg">#FFE3C2</color>
     <color name="cc_dark_warm_accent_text">#994f00</color>
 
@@ -144,6 +145,21 @@
     <color name="red_900">#B71C1C</color>
     
     <!-- Button colors -->
-    <color name="button_primary">#005ab2</color>
-    <color name="button_disabled">#d0e3ff</color>
+    <color name="button_disabled">@color/cc_neutral_bg</color>
+    <color name="button_primary_color">@color/cc_brand_color</color>
+
+    <!-- Square button colours -->
+    <color name="start_home_button">#6AB849</color>
+    <color name="start_save_button">#1B998B</color>
+    <color name="start_sync_button">@color/cc_brand_color</color>
+    <color name="start_sync_dark_button">#3b4fb6</color>
+    <color name="start_logout_button">#373534</color>
+    <color name="barcode_button_color">#3843D0</color>
+    <color name="url_button_color">#8EA1FF</color>
+    <color name="square_button_icon_color">#FFFFFF</color>
+
+
+    <!-- Progress bar colors -->
+    <color name="progress_bar_bg">#66000000</color>
+
 </resources>
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
index 6c4d2efb34..6d1d7d0435 100755
--- a/app/res/values/dimens.xml
+++ b/app/res/values/dimens.xml
@@ -24,6 +24,8 @@
     <dimen name="standard_spacer_large">24dp</dimen>
     <dimen name="standard_title_margin_bottom">20dp</dimen>
     <dimen name="min_button_height">52dp</dimen>
+    <dimen name="min_button_width">88dp</dimen>
+    <dimen name="rounded_button_corner_radius">22dp</dimen>
     <dimen name="spacer">10dp</dimen>
 
     <dimen name="action_icon_size">60dp</dimen>
@@ -35,7 +37,7 @@
     <dimen name="list_icon_bounding_dimen">60dp</dimen>
     <dimen name="list_grid_bounding_dimension">180dp</dimen>
 
-    <dimen name="numeric_badge_width_for_list">20dp</dimen>
+    <dimen name="numeric_badge_width_for_list">28dp</dimen>
     <dimen name="numeric_badge_font_size_list">10dp</dimen>
 
     <dimen name="menu_grid_icon_size">120dp</dimen>
@@ -103,6 +105,7 @@
     <dimen name="new_progressbar_button_minheight">48dp</dimen>
     <dimen name="new_progressbar_button_minwidth">32dp</dimen>
     <dimen name="new_progressbar_button_padding">24dp</dimen>
+    <dimen name="modern_progressbar_radius">4dp</dimen>
 
     <dimen name="submission_progressbar_height">10dp</dimen>
 
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index 731313a1e9..47c7d42dec 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -15,7 +15,7 @@
     <!-- region: All strings for multiple apps and app-agnostic properties -->
 
     <string name="manager_activity_name">App Manager</string>
-    <string name="install_app">Install An App</string>
+    <string name="install_app">Install an App</string>
     <string name="uninstall_app">Uninstall</string>
     <string name="archive_app">Archive</string>
     <string name="unarchive_app">Unarchive</string>
@@ -393,6 +393,8 @@
     <string name="notification_channel_user_session_description" cc:translatable="true">Notification containing information around current user session like when the current session is scheduled to expire</string>
     <string name="notification_channel_server_communication_title" cc:translatable="true">Server Communications</string>
     <string name="notification_channel_server_communication_description" cc:translatable="true">Notifications for status of any background server communication happening at the moment like CommCare App updates, log submission etc.</string>
+    <string name="notification_channel_push_notfications_title" cc:translatable="true">Priority notifications from Server</string>
+    <string name="notification_channel_push_notfications_description" cc:translatable="true">Notifications sent from server directly to notify user of priority tasks</string>
 
     <!--Recovery Measures-->
     <string name="recovery_measure_reinstall_method" cc:translatable="true">Choose Reinstall Method</string>
@@ -451,5 +453,7 @@
     <string name="dependency_missing_dialog_go_to_store" cc:translatable="true">Install from Store</string>
     <string name="dependency_missing_dialog_playstore_not_found" cc:translatable="true">No Play Store found on your device</string>
     <string name="fcm_notification">FCM Notification</string>
-    <string name="fcm_default_notification_channel">notification-channel-server-communications</string>
+    <string name="fcm_default_notification_channel">notification-channel-push-notifications</string>
+    <string name="app_with_id_not_found">Required CommCare App is not installed on device</string>
+    <string name="audio_recording_notification">Audio Recording Notification</string>
 </resources>
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 580aa8d292..a57fa7d90f 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -270,8 +270,10 @@
     </style>
 
     <style name="MapButton">
-        <item name="backgroundTint">@null</item>
         <item name="android:minWidth">@dimen/map_button_min_width</item>
+        <item name="cornerRadius">@dimen/rounded_button_corner_radius</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:insetTop">0dp</item>
     </style>
 
     <style name="MapButtonColored" parent="MapButton">
@@ -279,18 +281,66 @@
     </style>
 
     <style name="MapButtonGreen" parent="MapButtonColored">
-        <item name="android:background">@drawable/button_green_background</item>
+        <item name="android:backgroundTint">@color/button_green_background</item>
     </style>
 
     <style name="MapButtonRed" parent="MapButtonColored">
-        <item name="android:background">@drawable/button_red_background</item>
+        <item name="android:backgroundTint">@color/button_red_background</item>
     </style>
 
     <style name="MapButtonOrange" parent="MapButtonColored">
-        <item name="android:background">@drawable/button_orange_background</item>
+        <item name="android:backgroundTint">@color/button_orange_background</item>
     </style>
 
     <color name="login_edit_text_color">@color/cc_core_text</color>
     <color name="login_edit_text_color_error">@color/cc_attention_negative_color</color>
     <dimen name="map_button_min_width">120dp</dimen>
+
+    <style name="FullScreenVideoButton">
+        <item name="background">@null</item>
+        <item name="android:layout_width">71dip</item>
+        <item name="android:layout_height">52dip</item>
+    </style>
+
+    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowBackground">"@color/black"</item>
+        <item name="android:navigationBarColor">@color/black</item>
+    </style>
+
+    <style name="AlertDialogButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:background">@drawable/rounded_button_shape</item>
+        <item name="android:minWidth">@dimen/min_button_width</item>
+        <item name="backgroundTint">@color/cc_brand_color</item>
+    </style>
+
+        <style name="CustomButtonStyle" parent="Widget.MaterialComponents.Button">
+            <item name="backgroundTint">@color/primary_button_background</item>
+            <item name="android:textColor">@color/white</item>
+            <item name="android:textSize">16sp</item>
+            <item name="android:gravity">center</item>
+            <item name="android:padding">12dp</item>
+            <item name="height">40dp</item>
+            <item name="cornerRadius">@dimen/rounded_button_corner_radius</item>
+            <item name="iconPadding">8dp</item>
+            <item name="android:textAllCaps">false</item>
+            <item name="android:textStyle">bold</item>
+            <item name="android:layout_margin">@dimen/spacer_small</item>
+        </style>
+    
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="shapeAppearanceOverlay">@style/NegativeButtonShapeAppearanceStyle</item>
+    </style>
+    <style name="NegativeButtonShapeAppearanceStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:background">@drawable/button_background_white</item>
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyBottomLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerFamilyBottomRight">rounded</item>
+        <item name="cornerSize">@dimen/rounded_button_corner_radius</item>
+        <item name="strokeColor">@color/cc_brand_color</item>
+        <item name="strokeWidth">2dp</item>
+        <item name="textColor">@color/cc_brand_color</item>
+    </style>
+
 </resources>
diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml
index 4b018153bc..3d3a9e00e8 100644
--- a/app/res/values/themes.xml
+++ b/app/res/values/themes.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="CommonTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <item name="colorPrimary">@color/cc_brand_color</item>
         <item name="colorPrimaryDark">@color/cc_brand_text</item>
         <item name="colorAccent">@color/cc_dark_cool_accent_color</item>
-        <item name="colorControlActivated">@color/cc_dark_cool_accent_color</item>
+        <item name="colorControlActivated">@color/cc_brand_color</item>
         <item name="android:textColorSecondary">@color/cc_neutral_text</item>
         <item name="android:textColorPrimary">@color/cc_core_text</item>
         <item name="buttonStyle">@style/Commcare.Button.Primary</item>
-        <item name="buttonBarButtonStyle">@style/Commcare.Button.Primary</item>
+        <item name="materialButtonStyle">@style/Commcare.Button.Primary.Rounded</item>
+        <item name="buttonBarButtonStyle">@style/AlertDialogButtonStyle</item>
         <item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Medium</item>
         <item name="android:colorBackground">@color/cc_core_bg</item>
         <item name="detail_odd_row_color">@color/cc_neutral_bg</item>
@@ -62,8 +63,7 @@
         <item name="background">@color/cc_brand_color</item>
         <item name="titleTextStyle">@style/ActionBar.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/ActionBarSubtitleTextStyle</item>
-        <item name="logo">@drawable/actionbar_modern_spacing</item>
-        <item name="actionButtonStyle">@style/ActionButtonStyle</item>
+        <item name="logo">@drawable/commcare_actionbar_logo_spacing</item>
     </style>
 
     <style name="dropDownListView" parent="Widget.AppCompat.ListView.DropDown">
@@ -72,7 +72,8 @@
 
     <style name="ActionBar.TitleTextStyle">
         <item name="android:textColor">@color/white</item>
-        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:textSize">22sp</item>
     </style>
 
     <style name="ActionBarSubtitleTextStyle">
@@ -135,6 +136,8 @@
 
     <style name="Commcare.Button.Primary" parent="commcare_primary_button" />
 
+    <style name="Commcare.Button.Primary.Rounded" parent="CustomButtonStyle" />
+
     <style name="CommCare.Button.Default" parent="Widget.AppCompat.Button">
         <item name="textAllCaps">true</item>
         <item name="backgroundTint">@null</item>
diff --git a/app/res/xml/main_preferences.xml b/app/res/xml/main_preferences.xml
index 82de52108e..11985e64df 100644
--- a/app/res/xml/main_preferences.xml
+++ b/app/res/xml/main_preferences.xml
@@ -54,6 +54,13 @@
         android:entryValues="@array/pref_enabled_vals"
         android:key="cc-enable-tts"
         android:title="Enable Text To Speech"/>
+    <androidx.preference.ListPreference
+        android:defaultValue="no"
+        android:enabled="true"
+        android:entries="@array/pref_enabled_labels"
+        android:entryValues="@array/pref_enabled_vals"
+        android:key="cc-auto-form-save-on-pause"
+        android:title="Auto Save Form on Pause"/>
     <Preference
         android:key="disable-analytics-button"/>
     <Preference
diff --git a/app/res/xml/preferences_developer.xml b/app/res/xml/preferences_developer.xml
index 99c91e5cf9..cbfcd1229e 100644
--- a/app/res/xml/preferences_developer.xml
+++ b/app/res/xml/preferences_developer.xml
@@ -166,4 +166,16 @@
         android:entryValues="@array/pref_enabled_vals"
         android:key="cc-allow-space-in-select-choices"
         android:title="Allow Space in Select Choices"/>
+    <androidx.preference.ListPreference
+        android:defaultValue="no"
+        android:enabled="true"
+        android:entries="@array/pref_enabled_labels"
+        android:entryValues="@array/pref_enabled_vals"
+        android:key="cc-enable-certificate-transparency"
+        android:title="Certificate Transparency"/>
+    <EditTextPreference
+        android:dialogMessage="The URL must use the HTTPS protocol"
+        android:enabled="true"
+        android:key="log_receiver_url"
+        android:title="Override Log Submission Server"/>
 </PreferenceScreen>
diff --git a/app/src/org/commcare/CommCareApplication.java b/app/src/org/commcare/CommCareApplication.java
index abea186b68..e421ca9fc9 100644
--- a/app/src/org/commcare/CommCareApplication.java
+++ b/app/src/org/commcare/CommCareApplication.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
+import android.app.Application;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -17,7 +18,10 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.multidex.MultiDexApplication;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.preference.PreferenceManager;
 import androidx.work.BackoffPolicy;
 import androidx.work.Constraints;
@@ -73,7 +77,7 @@
 import org.commcare.models.database.MigrationException;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.models.database.global.DatabaseGlobalOpenHelper;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.models.legacy.LegacyInstallUtils;
 import org.commcare.modern.database.Table;
 import org.commcare.modern.session.SessionWrapper;
@@ -81,7 +85,7 @@
 import org.commcare.network.DataPullRequester;
 import org.commcare.network.DataPullResponseFactory;
 import org.commcare.network.HttpUtils;
-import org.commcare.network.ISRGCertConfig;
+import org.commcare.network.OkHttpBuilderCustomConfig;
 import org.commcare.preferences.DevSessionRestorer;
 import org.commcare.preferences.DeveloperPreferences;
 import org.commcare.preferences.HiddenPreferences;
@@ -116,6 +120,7 @@
 import org.commcare.utils.SessionUnavailableException;
 import org.commcare.views.widgets.CleanRawMedia;
 import org.javarosa.core.model.User;
+import org.javarosa.core.model.condition.RequestAbandonedException;
 import org.javarosa.core.reference.ReferenceManager;
 import org.javarosa.core.reference.RootTranslator;
 import org.javarosa.core.services.Logger;
@@ -137,10 +142,12 @@
 import io.noties.markwon.Markwon;
 import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
+import io.reactivex.exceptions.UndeliverableException;
+import io.reactivex.plugins.RxJavaPlugins;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-public class CommCareApplication extends MultiDexApplication {
+public class CommCareApplication extends Application implements LifecycleEventObserver {
 
     private static final String TAG = CommCareApplication.class.getSimpleName();
 
@@ -196,6 +203,8 @@ public class CommCareApplication extends MultiDexApplication {
     private boolean invalidateCacheOnRestore;
     private CommCareNoficationManager noficationManager;
 
+    private boolean backgroundSyncSafe;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -220,8 +229,6 @@ public void onCreate() {
         // improperly, so the second https request in a short time period will flop)
         System.setProperty("http.keepAlive", "false");
 
-        attachISRGCert();
-
         Thread.setDefaultUncaughtExceptionHandler(new CommCareExceptionHandler(Thread.getDefaultUncaughtExceptionHandler(), this));
 
         loadSqliteLibs();
@@ -249,10 +256,12 @@ public void onCreate() {
         GraphUtil.setLabelCharacterLimit(getResources().getInteger(R.integer.graph_label_char_limit));
 
         FirebaseMessagingUtil.verifyToken();
-    }
 
-    protected void attachISRGCert() {
-        CommCareNetworkServiceGenerator.customizeRetrofitSetup(new ISRGCertConfig());
+        customiseOkHttp();
+
+        setRxJavaGlobalHandler();
+
+        ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
     }
 
     protected void loadSqliteLibs() {
@@ -291,6 +300,14 @@ private void logFirstCommCareRun() {
         }
     }
 
+    public void setBackgroundSyncSafe(boolean backgroundSyncSafe){
+        this.backgroundSyncSafe = backgroundSyncSafe;
+    }
+
+    public boolean isBackgroundSyncSafe(){
+        return this.backgroundSyncSafe;
+    }
+
     // Whether user is running CommCare for the first time after installation
     public static boolean isFirstRunAfterInstall() {
         SharedPreferences preferences =
@@ -540,6 +557,10 @@ public void initializeAppResources(CommCareApp app) {
             FirebaseAnalyticsUtil.reportCorruptAppState();
         }
         app.setAppResourceState(resourceState);
+
+        // This is part of the CommCare app initialization because it needs to be applied during
+        // app initialization, update and when switching the seated app
+        customiseOkHttp();
     }
 
     /**
@@ -769,8 +790,8 @@ public void onServiceConnected(ComponentName className, IBinder service) {
                             PurgeStaleArchivedFormsTask.launchPurgeTask();
                         }
 
-                        if (EntityStorageCache.getEntityCacheWipedPref(user.getUniqueId()) < ReportingUtils.getAppVersion()) {
-                            EntityStorageCache.wipeCacheForCurrentApp();
+                        if (CommCareEntityStorageCache.getEntityCacheWipedPref(user.getUniqueId()) < ReportingUtils.getAppVersion()) {
+                            CommCareEntityStorageCache.wipeCacheForCurrentApp();
                         }
 
                         purgeLogs();
@@ -1163,7 +1184,7 @@ public ModernHttpRequester buildHttpRequester(Context context, String url,
 
         CommCareNetworkService networkService;
         if (authInfo instanceof AuthInfo.NoAuth) {
-            networkService = CommCareNetworkServiceGenerator.createNoAuthCommCareNetworkService();
+            networkService = CommCareNetworkServiceGenerator.createNoAuthCommCareNetworkService(params);
         } else {
             networkService = CommCareNetworkServiceGenerator.createCommCareNetworkService(
                     HttpUtils.getCredential(authInfo),
@@ -1192,4 +1213,30 @@ public boolean isNsdServicesEnabled() {
         return true;
     }
 
+    public void customiseOkHttp() {
+        CommCareNetworkServiceGenerator.customizeRetrofitSetup(new OkHttpBuilderCustomConfig());
+    }
+
+    private void setRxJavaGlobalHandler() {
+        RxJavaPlugins.setErrorHandler(throwable -> {
+            if (throwable instanceof UndeliverableException) {
+                throwable = throwable.getCause();
+            }
+            // Swallow RequestAbandonedException
+            if (throwable instanceof RequestAbandonedException) {
+                return;
+            }
+
+            Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), throwable);
+        });
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner source, @NonNull Lifecycle.Event event) {
+        switch (event) {
+            case ON_DESTROY:
+                Logger.log(LogTypes.TYPE_MAINTENANCE, "CommCare has been closed");
+                break;
+        }
+    }
 }
diff --git a/app/src/org/commcare/CommCareNoficationManager.java b/app/src/org/commcare/CommCareNoficationManager.java
index b260bfc34e..d3324f75b8 100644
--- a/app/src/org/commcare/CommCareNoficationManager.java
+++ b/app/src/org/commcare/CommCareNoficationManager.java
@@ -27,6 +27,8 @@
 
 import static android.content.Context.NOTIFICATION_SERVICE;
 
+import static org.commcare.sync.ExternalDataUpdateHelper.sendBroadcastFailSafe;
+
 /**
  * Handles displaying and clearing pinned notifications for CommCare
  */
@@ -38,6 +40,7 @@ public class CommCareNoficationManager {
     public static final String NOTIFICATION_CHANNEL_ERRORS_ID = "notification-channel-errors";
     public static final String NOTIFICATION_CHANNEL_USER_SESSION_ID = "notification-channel-user-session";
     public static final String NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID = "notification-channel-server-communications";
+    public static final String NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID = "notification-channel-push-notifications";
 
     /**
      * Handler to receive notifications and show them the user using toast.
@@ -59,29 +62,31 @@ private void updateMessageNotification() {
                 return;
             }
 
-            String title = pendingMessages.get(0).getTitle();
-
-            // The PendingIntent to launch our activity if the user selects this notification
-            Intent i = new Intent(context, MessageActivity.class);
-
-            int intentFlags = 0;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-                intentFlags = PendingIntent.FLAG_IMMUTABLE;
-            PendingIntent contentIntent = PendingIntent.getActivity(context, 0, i, intentFlags);
-
-            String additional = pendingMessages.size() > 1 ? Localization.get("notifications.prompt.more", new String[]{String.valueOf(pendingMessages.size() - 1)}) : "";
-            Notification messageNotification = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ERRORS_ID)
-                    .setContentTitle(title)
-                    .setContentText(Localization.get("notifications.prompt.details", new String[]{additional}))
-                    .setSmallIcon(R.drawable.notification)
-                    .setNumber(pendingMessages.size())
-                    .setContentIntent(contentIntent)
-                    .setDeleteIntent(PendingIntent.getBroadcast(context, 0, new Intent(context, NotificationClearReceiver.class), intentFlags))
-                    .setOngoing(true)
-                    .setWhen(System.currentTimeMillis())
-                    .build();
-
-            mNM.notify(MESSAGE_NOTIFICATION, messageNotification);
+            if (areNotificationsEnabled()) {
+                String title = pendingMessages.get(0).getTitle();
+
+                // The PendingIntent to launch our activity if the user selects this notification
+                Intent i = new Intent(context, MessageActivity.class);
+
+                int intentFlags = 0;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+                    intentFlags = PendingIntent.FLAG_IMMUTABLE;
+                PendingIntent contentIntent = PendingIntent.getActivity(context, 0, i, intentFlags);
+
+                String additional = pendingMessages.size() > 1 ? Localization.get("notifications.prompt.more", new String[]{String.valueOf(pendingMessages.size() - 1)}) : "";
+                Notification messageNotification = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ERRORS_ID)
+                        .setContentTitle(title)
+                        .setContentText(Localization.get("notifications.prompt.details", new String[]{additional}))
+                        .setSmallIcon(R.drawable.commcare_actionbar_logo)
+                        .setNumber(pendingMessages.size())
+                        .setContentIntent(contentIntent)
+                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, new Intent(context, NotificationClearReceiver.class), intentFlags))
+                        .setOngoing(true)
+                        .setWhen(System.currentTimeMillis())
+                        .build();
+
+                mNM.notify(MESSAGE_NOTIFICATION, messageNotification);
+            }
         }
     }
 
@@ -98,6 +103,7 @@ public void clearNotifications(String category) {
             for (NotificationMessage message : toRemove) {
                 pendingMessages.remove(message);
             }
+
             if (pendingMessages.size() == 0) {
                 mNM.cancel(MESSAGE_NOTIFICATION);
             } else {
@@ -108,7 +114,7 @@ public void clearNotifications(String category) {
 
     public ArrayList<NotificationMessage> purgeNotifications() {
         synchronized (pendingMessages) {
-            context.sendBroadcast(new Intent(ACTION_PURGE_NOTIFICATIONS));
+            sendBroadcastFailSafe(context, new Intent(ACTION_PURGE_NOTIFICATIONS), null);
             ArrayList<NotificationMessage> cloned = (ArrayList<NotificationMessage>)pendingMessages.clone();
             clearNotifications(null);
             return cloned;
@@ -142,6 +148,15 @@ public void reportNotificationMessage(final NotificationMessage message, boolean
         }
     }
 
+    public boolean areNotificationsEnabled() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return ((NotificationManager)context.getSystemService(NOTIFICATION_SERVICE))
+                    .areNotificationsEnabled();
+        } else {
+            return true;
+        }
+    }
+
     /**
      * From the current activity context, perform a (non-return coded) intent callout to
      * view the notifications screen.
@@ -176,6 +191,11 @@ public void createNotificationChannels() {
                 R.string.notification_channel_server_communication_title,
                 R.string.notification_channel_server_communication_description,
                 NotificationManager.IMPORTANCE_LOW);
+
+        createNotificationChannel(NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID,
+                R.string.notification_channel_push_notfications_title,
+                R.string.notification_channel_push_notfications_description,
+                NotificationManager.IMPORTANCE_DEFAULT);
     }
 
     @TargetApi(Build.VERSION_CODES.O)
diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
index ce7968295e..88828f1e6f 100755
--- a/app/src/org/commcare/activities/CommCareActivity.java
+++ b/app/src/org/commcare/activities/CommCareActivity.java
@@ -1,10 +1,13 @@
 package org.commcare.activities;
 
+
+import static org.commcare.preferences.HiddenPreferences.isBackgroundSyncEnabled;
 import static org.commcare.preferences.HiddenPreferences.isFlagSecureEnabled;
+import static org.commcare.sync.ExternalDataUpdateHelper.COMMCARE_DATA_UPDATE_ACTION;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.IntentFilter;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -32,6 +35,8 @@
 import org.commcare.interfaces.WithUIController;
 import org.commcare.logic.DetailCalloutListenerDefaultImpl;
 import org.commcare.preferences.LocalePreferences;
+import org.commcare.services.DataSyncCompleteBroadcastReceiver;
+import org.commcare.services.FCMMessageData;
 import org.commcare.session.CommCareSession;
 import org.commcare.session.SessionFrame;
 import org.commcare.session.SessionInstanceBuilder;
@@ -125,6 +130,7 @@ public abstract class CommCareActivity<R> extends AppCompatActivity
     private ContainerFragment<Bundle> managedUiState;
     private boolean isMainScreenBlocked;
 
+    private DataSyncCompleteBroadcastReceiver dataSyncCompleteBroadcastReceiver;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -157,7 +163,7 @@ protected void onCreate(Bundle savedInstanceState) {
             persistManagedUiState(fm);
 
             if (getSupportActionBar() != null) {
-                getSupportActionBar().setLogo(org.commcare.dalvik.R.mipmap.commcare_launcher);
+                getSupportActionBar().setLogo(org.commcare.dalvik.R.drawable.commcare_actionbar_logo_spacing);
             }
 
             if (shouldShowBreadcrumbBar()) {
@@ -292,6 +298,25 @@ private void showPendingUserMessage() {
     protected void onResume() {
         super.onResume();
         AudioController.INSTANCE.playPreviousAudio();
+
+        CommCareApplication.instance().setBackgroundSyncSafe(true);
+
+        if (shouldListenToSyncComplete() && isBackgroundSyncEnabled()) {
+            dataSyncCompleteBroadcastReceiver = new DataSyncCompleteBroadcastReceiver();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                registerReceiver(
+                        dataSyncCompleteBroadcastReceiver,
+                        new IntentFilter(COMMCARE_DATA_UPDATE_ACTION), Context.RECEIVER_NOT_EXPORTED);
+            } else {
+                registerReceiver(
+                        dataSyncCompleteBroadcastReceiver, new IntentFilter(COMMCARE_DATA_UPDATE_ACTION));
+            }
+        }
+    }
+
+    // Activities that needs to restart after sync should override this to return true
+    public boolean shouldListenToSyncComplete() {
+        return false;
     }
 
     @Override
@@ -315,6 +340,10 @@ protected void onPause() {
 
         areFragmentsPaused = true;
         AudioController.INSTANCE.systemInducedPause();
+
+        if (dataSyncCompleteBroadcastReceiver != null) {
+            unregisterReceiver(dataSyncCompleteBroadcastReceiver);
+        }
     }
 
     @Override
@@ -702,6 +731,9 @@ public boolean aTaskInProgress() {
         return stateHolder != null && stateHolder.isCurrentTaskRunning();
     }
 
+    // Dummy method, should be implemented by each Activity that is not safe for a background sync
+    public void alertPendingSync(FCMMessageData fcmMessageData) {}
+
     /**
      * Interface to perform additional setup code when adding an ActionBar
      */
diff --git a/app/src/org/commcare/activities/CommCareGraphActivity.java b/app/src/org/commcare/activities/CommCareGraphActivity.java
index 1d82f689a2..156f6cbd17 100755
--- a/app/src/org/commcare/activities/CommCareGraphActivity.java
+++ b/app/src/org/commcare/activities/CommCareGraphActivity.java
@@ -31,9 +31,5 @@ protected void onCreate(Bundle savedInstanceState) {
     protected void onDestroy() {
         super.onDestroy();
         FirebaseAnalyticsUtil.reportGraphViewFullScreenClosed();
-
-        String title = getTitle() == null || getTitle().length() == 0 ? "(no title)" : getTitle().toString();
-        Logger.log(LogTypes.TYPE_GRAPHING,
-                String.format("End viewing full screen graph for %s", title));
     }
 }
diff --git a/app/src/org/commcare/activities/CommCareSetupActivity.java b/app/src/org/commcare/activities/CommCareSetupActivity.java
index e0117eaad4..3b363901dd 100644
--- a/app/src/org/commcare/activities/CommCareSetupActivity.java
+++ b/app/src/org/commcare/activities/CommCareSetupActivity.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.content.RestrictionsManager;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.util.Log;
@@ -25,10 +24,10 @@
 import org.commcare.AppUtils;
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
-import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.dalvik.R;
 import org.commcare.engine.resource.AppInstallStatus;
+import org.commcare.engine.resource.ResourceInstallUtils;
 import org.commcare.engine.resource.installers.SingleAppInstallation;
 import org.commcare.fragments.ContainerFragment;
 import org.commcare.fragments.InstallConfirmFragment;
@@ -45,11 +44,10 @@
 import org.commcare.resources.model.InvalidResourceException;
 import org.commcare.resources.model.UnresolvedResourceException;
 import org.commcare.tasks.ResourceEngineListener;
-import org.commcare.tasks.ResourceEngineTask;
 import org.commcare.tasks.RetrieveParseVerifyMessageListener;
 import org.commcare.tasks.RetrieveParseVerifyMessageTask;
-import org.commcare.utils.ConsumerAppsUtil;
 import org.commcare.utils.ApkDependenciesUtils;
+import org.commcare.utils.ConsumerAppsUtil;
 import org.commcare.utils.MultipleAppsUtil;
 import org.commcare.utils.Permissions;
 import org.commcare.views.ManagedUi;
@@ -61,7 +59,6 @@
 import org.javarosa.core.reference.InvalidReferenceException;
 import org.javarosa.core.reference.ReferenceManager;
 import org.javarosa.core.services.locale.Localization;
-import org.javarosa.core.util.PropertyUtils;
 
 import java.io.IOException;
 import java.security.SignatureException;
@@ -460,103 +457,19 @@ public void stopBlockingForTask(int id) {
 
     private void startResourceInstall() {
         if (startAllowed) {
-            ccApp = getCommCareApp();
-            containerFragment.setData(ccApp);
-
             CustomProgressDialog lastDialog = getCurrentProgressDialog();
             // used to tell the ResourceEngineTask whether or not it should
             // sleep before it starts, set based on whether we are currently
             // in keep trying mode.
             boolean shouldSleep = (lastDialog != null) && lastDialog.isChecked();
 
-            ResourceEngineTask<CommCareSetupActivity> task =
-                    new ResourceEngineTask<CommCareSetupActivity>(ccApp,
-                            DIALOG_INSTALL_PROGRESS, shouldSleep, false) {
-
-                        @Override
-                        protected void deliverResult(CommCareSetupActivity receiver,
-                                                     AppInstallStatus result) {
-                            handleAppInstallResult(this, receiver, result);
-                        }
-
-                        @Override
-                        protected void deliverUpdate(CommCareSetupActivity receiver,
-                                                     int[]... update) {
-                            receiver.updateResourceProgress(update[0][0], update[0][1], update[0][2]);
-                        }
-
-                        @Override
-                        protected void deliverError(CommCareSetupActivity receiver,
-                                                    Exception e) {
-                            receiver.failUnknown(AppInstallStatus.UnknownFailure);
-                        }
-                    };
-
-            task.connect(this);
-            task.executeParallel(incomingRef);
+            ccApp = ResourceInstallUtils.startAppInstallAsync(shouldSleep, DIALOG_INSTALL_PROGRESS, this, incomingRef);
+            containerFragment.setData(ccApp);
         } else {
             Log.i(TAG, "During install: blocked a resource install press since a task was already running");
         }
     }
 
-    public static void handleAppInstallResult(ResourceEngineTask resourceEngineTask, ResourceEngineListener receiver, AppInstallStatus result) {
-        switch (result) {
-            case Installed:
-                receiver.reportSuccess(true);
-                break;
-            case UpToDate:
-                receiver.reportSuccess(false);
-                break;
-            case MissingResourcesWithMessage:
-                // fall through to more general case:
-            case MissingResources:
-                receiver.failMissingResource(resourceEngineTask.getMissingResourceException(), result);
-                break;
-            case InvalidResource:
-                receiver.failInvalidResource(resourceEngineTask.getInvalidResourceException(), result);
-                break;
-            case InvalidReference:
-                receiver.failInvalidReference(resourceEngineTask.getInvalidReferenceException(), result);
-                break;
-            case IncompatibleReqs:
-                receiver.failBadReqs(resourceEngineTask.getVersionRequired(),
-                        resourceEngineTask.getVersionAvailable(), resourceEngineTask.isMajorIsProblem());
-                break;
-            case NoLocalStorage:
-                receiver.failWithNotification(AppInstallStatus.NoLocalStorage);
-                break;
-            case NoConnection:
-                receiver.failWithNotification(AppInstallStatus.NoConnection);
-                break;
-            case BadSslCertificate:
-                receiver.failWithNotification(AppInstallStatus.BadSslCertificate, NotificationActionButtonInfo.ButtonAction.LAUNCH_DATE_SETTINGS);
-                break;
-            case DuplicateApp:
-                receiver.failWithNotification(AppInstallStatus.DuplicateApp);
-                break;
-            case IncorrectTargetPackage:
-                receiver.failTargetMismatch();
-                break;
-            case ReinstallFromInvalidCcz:
-                receiver.failUnknown(AppInstallStatus.ReinstallFromInvalidCcz);
-                break;
-            case CaptivePortal:
-                receiver.failWithNotification(AppInstallStatus.CaptivePortal);
-                break;
-            default:
-                receiver.failUnknown(AppInstallStatus.UnknownFailure);
-                break;
-        }
-    }
-
-    public static CommCareApp getCommCareApp() {
-        ApplicationRecord newRecord =
-                new ApplicationRecord(PropertyUtils.genUUID().replace("-", ""),
-                        ApplicationRecord.STATUS_UNINITIALIZED);
-
-        return new CommCareApp(newRecord);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
diff --git a/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java b/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
index eb3a56756d..5c99bb690a 100644
--- a/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
+++ b/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
@@ -1,13 +1,12 @@
 package org.commcare.activities;
 
-import android.annotation.TargetApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AlertDialog;
+import android.Manifest;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.net.wifi.p2p.WifiP2pConfig;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pManager;
@@ -16,13 +15,21 @@
 import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.MutableLiveData;
+
+
 import org.commcare.CommCareApplication;
 import org.commcare.android.adapters.WiFiDirectUIController;
 import org.commcare.android.database.user.models.FormRecord;
@@ -63,6 +70,10 @@
 import java.io.OutputStream;
 import java.util.Vector;
 
+import static org.commcare.activities.CommCareWiFiDirectActivity.PermissionAction.INFORM_FEATURE_DEGRADATION;
+import static org.commcare.activities.CommCareWiFiDirectActivity.PermissionAction.REQUEST_PERMISSION;
+import static org.commcare.activities.CommCareWiFiDirectActivity.PermissionAction.SHOW_PERMISSION_RATIONALE;
+
 /**
  * An activity that uses WiFi Direct APIs to discover and connect with available
  * devices. WiFi Direct APIs are asynchronous and rely on callback mechanism
@@ -104,6 +115,38 @@ public enum wdState {send, receive, submit}
 
     private FormRecord[] cachedRecords;
 
+    private final int NEARBY_WIFI_PERM_REQUEST = 2;
+    private final String SHOW_PERMISSION_DIALOG = "show-permission-dialog";
+    /**
+     * Responsible for showing a dialog to the user related with permissions acquisition and its
+     * restoration in case of configuration changes, it can take:
+     * - NO_ACTION - No action
+     * - REJECT_FEATURE - Inform the user about feature unavailability when the permission was not
+     * granted
+     * - SHOW_PERMISSION_RATIONALE - Show the reason for needing the permission
+     * - REQUEST_PERMISSION - Request permission to the user
+     */
+    private MutableLiveData<PermissionAction> showingPermissionDialog = new MutableLiveData<>(PermissionAction.NO_ACTION);
+
+    public enum PermissionAction {
+        NO_ACTION,
+        INFORM_FEATURE_DEGRADATION,
+        SHOW_PERMISSION_RATIONALE,
+        REQUEST_PERMISSION;
+    }
+
+    {
+        showingPermissionDialog.observe(this, value -> {
+            if (value == INFORM_FEATURE_DEGRADATION) {
+                informUserAboutFeatureUnavailability();
+            } else if (value == SHOW_PERMISSION_RATIONALE) {
+                showNearbyWiFiPermissionRationale();
+            } else if (value == REQUEST_PERMISSION) {
+                requestNearbyWifiPermission();
+            }
+        });
+    }
+
     @Override
     public void onCreateSessionSafe(Bundle savedInstanceState) {
         super.onCreateSessionSafe(savedInstanceState);
@@ -137,6 +180,25 @@ public void onCreateSessionSafe(Bundle savedInstanceState) {
             showChangeStateDialog();
         }
         uiController.setupUI();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            checkMissingNearbyWifiPermission();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(SHOW_PERMISSION_DIALOG, showingPermissionDialog.getValue().ordinal());
+    }
+
+    @Override
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        if (savedInstanceState != null) {
+            showingPermissionDialog.setValue(
+                    PermissionAction.values()[savedInstanceState.getInt(SHOW_PERMISSION_DIALOG)]);
+        }
     }
 
     @Override
@@ -163,7 +225,11 @@ public void onResumeSessionSafe() {
                 .findFragmentById(R.id.wifi_manager_fragment);
 
         mReceiver = new WiFiDirectBroadcastReceiver(mManager, fragment);
-        registerReceiver(mReceiver, mIntentFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(mReceiver, mIntentFilter, Context.RECEIVER_EXPORTED);
+        } else {
+            registerReceiver(mReceiver, mIntentFilter);
+        }
 
         fragment.startReceiver(mManager, mChannel);
 
@@ -221,7 +287,7 @@ private void showDialog(AppCompatActivity activity, String title, String message
             dismissAlertDialog();
         };
         d.setNeutralButton(localize("wifi.direct.receive.forms"), listener);
-        d.setNegativeButton(localize("wifi.direct.transfer.forms"), listener);
+        d.setNegativeButton(localize("wifi.direct.transfer.forms"), listener, true);
         d.setPositiveButton(localize("wifi.direct.submit.forms"), listener);
         showAlertDialog(d);
     }
@@ -899,4 +965,67 @@ public wdState getWifiDirectState() {
         return mState;
     }
 
+    private void checkMissingNearbyWifiPermission() {
+        if (isMissingNearbyWifiPermission()) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this,
+                    Manifest.permission.NEARBY_WIFI_DEVICES)) {
+                showingPermissionDialog.setValue(SHOW_PERMISSION_RATIONALE);
+            } else {
+                showingPermissionDialog.setValue(REQUEST_PERMISSION);
+            }
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        switch (requestCode) {
+            case NEARBY_WIFI_PERM_REQUEST:
+                for (int i = 0; i < permissions.length; i++) {
+                    if (permissions[i].equals(Manifest.permission.NEARBY_WIFI_DEVICES) &&
+                            grantResults[i] != PackageManager.PERMISSION_GRANTED) {
+                        // inform user and end activity
+                        showingPermissionDialog.setValue(INFORM_FEATURE_DEGRADATION);
+                    }
+                }
+        }
+    }
+
+    private boolean isMissingNearbyWifiPermission() {
+        return ContextCompat.checkSelfPermission(this,
+                Manifest.permission.NEARBY_WIFI_DEVICES) != PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void showNearbyWiFiPermissionRationale() {
+        StandardAlertDialog d = new StandardAlertDialog(this,
+                Localization.get("wifi.direct.permission.nearby.wifi.title"),
+                Localization.get("wifi.direct.permission.nearby.wifi.message"));
+        DialogInterface.OnClickListener listener = (dialog, which) -> {
+            showingPermissionDialog.setValue(REQUEST_PERMISSION);
+            dialog.dismiss();
+        };
+        d.setPositiveButton(Localization.get("dialog.ok"), listener);
+        showAlertDialog(d);
+    }
+
+    private void requestNearbyWifiPermission() {
+        ActivityCompat.requestPermissions(this,
+                new String[]{Manifest.permission.NEARBY_WIFI_DEVICES},
+                NEARBY_WIFI_PERM_REQUEST);
+    }
+
+    private void informUserAboutFeatureUnavailability() {
+        StandardAlertDialog d = StandardAlertDialog.getBasicAlertDialog(
+                this,
+                Localization.get("wifi.direct.permission.nearby.wifi.title"),
+                Localization.get("wifi.direct.permission.nearby.wifi.denial"),
+                (dialog, which) -> {
+                    showingPermissionDialog.setValue(PermissionAction.NO_ACTION);
+
+                    // terminate activity
+                    this.setResult(RESULT_CANCELED);
+                    this.finish();
+                });
+        showAlertDialog(d);
+    }
 }
diff --git a/app/src/org/commcare/activities/CommcareListActivity.java b/app/src/org/commcare/activities/CommcareListActivity.java
index b21d1239d1..8014095763 100644
--- a/app/src/org/commcare/activities/CommcareListActivity.java
+++ b/app/src/org/commcare/activities/CommcareListActivity.java
@@ -7,6 +7,7 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import org.commcare.CommCareApplication;
 import org.commcare.dalvik.R;
 
 /**
@@ -35,6 +36,13 @@ protected void onCreate(Bundle savedInstanceState) {
         mListView.setOnItemClickListener(mOnClickListener);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        CommCareApplication.instance().setBackgroundSyncSafe(true);
+    }
+
     public int getLayoutResource() {
         return R.layout.activity_commcare_list;
     }
diff --git a/app/src/org/commcare/activities/DispatchActivity.java b/app/src/org/commcare/activities/DispatchActivity.java
index 6e32b654cb..61c705f967 100644
--- a/app/src/org/commcare/activities/DispatchActivity.java
+++ b/app/src/org/commcare/activities/DispatchActivity.java
@@ -1,5 +1,7 @@
 package org.commcare.activities;
 
+import static org.commcare.commcaresupportlibrary.CommCareLauncher.SESSION_ENDPOINT_APP_ID;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -11,19 +13,25 @@
 import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.android.database.user.models.SessionStateDescriptor;
 import org.commcare.dalvik.R;
+import org.commcare.models.AndroidSessionWrapper;
 import org.commcare.preferences.DeveloperPreferences;
 import org.commcare.recovery.measures.ExecuteRecoveryMeasuresActivity;
 import org.commcare.recovery.measures.RecoveryMeasuresHelper;
+import org.commcare.session.CommCareSession;
+import org.commcare.suite.model.StackFrameStep;
 import org.commcare.utils.AndroidShortcuts;
 import org.commcare.utils.CommCareLifecycleUtils;
 import org.commcare.utils.MultipleAppsUtil;
 import org.commcare.utils.SessionUnavailableException;
+import org.javarosa.core.model.condition.EvaluationContext;
 import org.javarosa.core.services.locale.Localization;
 
 import java.util.ArrayList;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import javax.annotation.Nullable;
+
 /**
  * Dispatches install, login, and home screen activities.
  *
@@ -43,7 +51,7 @@ public class DispatchActivity extends AppCompatActivity {
     public static final String WAS_SHORTCUT_LAUNCH = "launch_from_shortcut";
     public static final String START_FROM_LOGIN = "process_successful_login";
     public static final String EXECUTE_RECOVERY_MEASURES = "execute_recovery_measures";
-
+    public static final String SESSION_REBUILD_REQUEST = "session_rebuild_request";
     private static final int LOGIN_USER = 0;
     private static final int HOME_SCREEN = 1;
     public static final int INIT_APP = 2;
@@ -72,7 +80,7 @@ public class DispatchActivity extends AppCompatActivity {
     private boolean waitingForActivityResultFromLogin;
 
     boolean alreadyCheckedForAppFilesChange;
-
+    static final String REBUILD_SESSION = "rebuild_session";
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -179,6 +187,9 @@ private void dispatch() {
                     }
                 } else if (!CommCareApplication.instance().getSession().isActive()) {
                     launchLoginScreen();
+                } else if (needAnotherAppLogin()){
+                    CommCareApplication.instance().closeUserSession();
+                    launchLoginScreen();
                 } else if (isExternalLaunch()) {
                     // CommCare was launched from an external app, with a session descriptor
                     handleExternalLaunch();
@@ -186,7 +197,8 @@ private void dispatch() {
                         !shortcutExtraWasConsumed) {
                     // CommCare was launched from a shortcut
                     handleShortcutLaunch();
-                } else {
+                }
+                else {
                     launchHomeScreen();
                 }
             } catch (SessionUnavailableException sue) {
@@ -195,6 +207,17 @@ private void dispatch() {
         }
     }
 
+    private boolean needAnotherAppLogin() {
+        String sesssionEndpointAppID = getSessionEndpointAppId();
+        if (sesssionEndpointAppID != null) {
+            CommCareApp currentApp = CommCareApplication.instance().getCurrentApp();
+            if (currentApp != null) {
+                return !currentApp.getUniqueId().equals(sesssionEndpointAppID);
+            }
+        }
+        return false;
+    }
+
     private boolean isExternalLaunch() {
         return this.getIntent().hasExtra(SESSION_REQUEST) ||
                 this.getIntent().hasExtra(SESSION_ENDPOINT_ID);
@@ -259,6 +282,10 @@ private void launchLoginScreen() {
             // AMS 06/09/16: This check is needed due to what we believe is a bug in the Android platform
             Intent i = new Intent(this, LoginActivity.class);
             i.putExtra(LoginActivity.USER_TRIGGERED_LOGOUT, userTriggeredLogout);
+            String sesssionEndpointAppID = getSessionEndpointAppId();
+            if (sesssionEndpointAppID != null) {
+                i.putExtra(LoginActivity.EXTRA_APP_ID, sesssionEndpointAppID);
+            }
             startActivityForResult(i, LOGIN_USER);
             waitingForActivityResultFromLogin = true;
         } else {
@@ -269,6 +296,11 @@ private void launchLoginScreen() {
         }
     }
 
+    @Nullable
+    private String getSessionEndpointAppId() {
+        return getIntent().getStringExtra(SESSION_ENDPOINT_APP_ID);
+    }
+
     private void launchHomeScreen() {
         Intent i;
         if (useRootMenuHomeActivity()) {
diff --git a/app/src/org/commcare/activities/EntityDetailActivity.java b/app/src/org/commcare/activities/EntityDetailActivity.java
index a8f4a48fbd..8d8d76d6b3 100755
--- a/app/src/org/commcare/activities/EntityDetailActivity.java
+++ b/app/src/org/commcare/activities/EntityDetailActivity.java
@@ -6,17 +6,11 @@
 import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 import org.commcare.CommCareApplication;
 import org.commcare.dalvik.R;
-import org.commcare.google.services.ads.AdLocation;
-import org.commcare.google.services.ads.AdMobManager;
 import org.commcare.google.services.analytics.AnalyticsParamValue;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.logic.DetailCalloutListenerDefaultImpl;
@@ -148,9 +142,11 @@ public void onCreateSessionSafe(Bundle savedInstanceState) {
 
         mDetailView.showMenu();
         isFinalSwipeActionEnabled = DeveloperPreferences.isDetailTabSwipeActionEnabled();
+    }
 
-        AdMobManager.requestBannerAdForView(this, this.findViewById(R.id.ad_container),
-                AdLocation.EntityDetail);
+    @Override
+    public boolean shouldListenToSyncComplete() {
+        return true;
     }
 
     @Override
diff --git a/app/src/org/commcare/activities/EntitySelectActivity.java b/app/src/org/commcare/activities/EntitySelectActivity.java
index 5cfa348b13..7c4fec9b0a 100755
--- a/app/src/org/commcare/activities/EntitySelectActivity.java
+++ b/app/src/org/commcare/activities/EntitySelectActivity.java
@@ -1,5 +1,8 @@
 package org.commcare.activities;
 
+import static org.commcare.activities.HomeScreenBaseActivity.RESULT_RESTART;
+
+import androidx.appcompat.app.AppCompatActivity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
@@ -37,8 +40,6 @@
 import org.commcare.fragments.ContainerFragment;
 import org.commcare.gis.EntityMapActivity;
 import org.commcare.gis.EntityMapboxActivity;
-import org.commcare.google.services.ads.AdLocation;
-import org.commcare.google.services.ads.AdMobManager;
 import org.commcare.models.AndroidSessionWrapper;
 import org.commcare.modern.session.SessionWrapper;
 import org.commcare.preferences.HiddenPreferences;
@@ -279,8 +280,6 @@ private void setupUI(boolean isOrientationChange) {
         persistAdapterState(visibleView);
         setUpCalloutClickListener();
         setupMapNav();
-        AdMobManager.requestBannerAdForView(this, findViewById(R.id.ad_container),
-                AdLocation.EntitySelect);
     }
 
     private void setUpCalloutClickListener() {
@@ -306,6 +305,11 @@ private void setupLandscapeDualPaneView() {
         message.setText(Localization.get("select.placeholder.message", new String[]{Localization.get("cchq.case")}));
     }
 
+    @Override
+    public boolean shouldListenToSyncComplete() {
+        return true;
+    }
+
     private void restoreExistingSelection(boolean isOrientationChange) {
         // Restore detail screen for selection from landscape mode as we move into portrait mode.
         if (isOrientationChange) {
@@ -573,6 +577,9 @@ public void onActivityResultSessionSafe(int requestCode, int resultCode, Intent
                 if (resultCode == RESULT_OK && !mViewMode) {
                     // create intent for return and store path
                     returnWithResult(intent);
+                } else if (resultCode == RESULT_RESTART) {
+                    this.setResult(RESULT_RESTART, intent);
+                    this.finish();
                 } else {
                     //Did we enter the detail from mapping mode? If so, go back to that
                     if (mResultIsMap) {
diff --git a/app/src/org/commcare/activities/FormAndDataSyncer.java b/app/src/org/commcare/activities/FormAndDataSyncer.java
index 3f24805e63..91968efa6b 100644
--- a/app/src/org/commcare/activities/FormAndDataSyncer.java
+++ b/app/src/org/commcare/activities/FormAndDataSyncer.java
@@ -1,15 +1,11 @@
 package org.commcare.activities;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.content.SharedPreferences;
 
 import org.commcare.CommCareApplication;
-import org.commcare.android.database.user.models.FormRecord;
-import org.commcare.dalvik.R;
 import org.commcare.engine.resource.installers.SingleAppInstallation;
 import org.commcare.interfaces.WithUIController;
-import org.commcare.models.database.SqlStorage;
 import org.commcare.network.DataPullRequester;
 import org.commcare.network.LocalReferencePullResponseFactory;
 import org.commcare.network.mocks.LocalFilePullResponseFactory;
@@ -22,9 +18,6 @@
 import org.commcare.tasks.PullTaskResultReceiver;
 import org.commcare.tasks.ResultAndError;
 import org.commcare.utils.FormUploadResult;
-import org.commcare.utils.StorageUtils;
-import org.commcare.views.notifications.NotificationActionButtonInfo;
-import org.commcare.views.notifications.NotificationMessageFactory;
 import org.javarosa.core.model.User;
 import org.javarosa.core.reference.InvalidReferenceException;
 import org.javarosa.core.reference.ReferenceManager;
@@ -56,8 +49,8 @@ void startUnsentFormsTask(SyncCapableCommCareActivity activity,
 
     @SuppressLint("NewApi")
     protected void processAndSendForms(final SyncCapableCommCareActivity activity,
-                                     final boolean syncAfterwards,
-                                     final boolean userTriggered) {
+                                       final boolean syncAfterwards,
+                                       final boolean userTriggered) {
 
         ProcessAndSendTask<SyncCapableCommCareActivity> processAndSendTask =
                 new ProcessAndSendTask<SyncCapableCommCareActivity>(activity, syncAfterwards) {
@@ -81,7 +74,7 @@ protected void deliverResult(SyncCapableCommCareActivity receiver, FormUploadRes
 
                         receiver.handleFormUploadResult(result, getLabelForFormsSent(), userTriggered);
 
-                        if(result == FormUploadResult.FULL_SUCCESS && syncAfterwards) {
+                        if (result == FormUploadResult.FULL_SUCCESS && syncAfterwards) {
                             syncDataForLoggedInUser(receiver, true, userTriggered);
                         }
                     }
@@ -102,8 +95,11 @@ protected void handleCancellation(SyncCapableCommCareActivity receiver) {
                     }
                 };
 
-        processAndSendTask.addSubmissionListener(
-                CommCareApplication.instance().getSession().getListenerForSubmissionNotification());
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            processAndSendTask.addSubmissionListener(
+                    CommCareApplication.instance().getSession().getListenerForSubmissionNotification());
+        }
+
         if (activity.usesSubmissionProgressBar()) {
             processAndSendTask.addProgressBarSubmissionListener(
                     new FormSubmissionProgressBarListener(activity));
@@ -196,7 +192,8 @@ private <I extends CommCareActivity & PullTaskResultReceiver> void syncData(
             DataPullRequester dataPullRequester, boolean blockRemoteKeyManagement) {
 
         DataPullTask<PullTaskResultReceiver> dataPullTask = new DataPullTask<PullTaskResultReceiver>(
-                username, password, userId, server, activity, dataPullRequester, blockRemoteKeyManagement) {
+                username, password, userId, server, activity, dataPullRequester,
+                blockRemoteKeyManagement, false) {
 
             @Override
             protected void deliverResult(PullTaskResultReceiver receiver,
diff --git a/app/src/org/commcare/activities/FormEntryActivity.java b/app/src/org/commcare/activities/FormEntryActivity.java
index 6639127a04..efb4228a33 100644
--- a/app/src/org/commcare/activities/FormEntryActivity.java
+++ b/app/src/org/commcare/activities/FormEntryActivity.java
@@ -56,7 +56,12 @@
 import org.commcare.logic.AndroidFormController;
 import org.commcare.models.AndroidSessionWrapper;
 import org.commcare.models.FormRecordProcessor;
+import org.commcare.models.database.InterruptedFormState;
 import org.commcare.models.database.SqlStorage;
+import org.commcare.preferences.HiddenPreferences;
+import org.commcare.preferences.MainConfigurablePreferences;
+import org.commcare.services.FCMMessageData;
+import org.commcare.services.PendingSyncAlertBroadcastReceiver;
 import org.commcare.tasks.FormLoaderTask;
 import org.commcare.tasks.SaveToDiskTask;
 import org.commcare.tts.TextToSpeechCallback;
@@ -74,6 +79,7 @@
 import org.commcare.views.dialogs.CommCareAlertDialog;
 import org.commcare.views.dialogs.CustomProgressDialog;
 import org.commcare.views.dialogs.StandardAlertDialog;
+import org.commcare.views.media.CommCareMediaController;
 import org.commcare.views.widgets.BarcodeWidget;
 import org.commcare.views.widgets.ImageWidget;
 import org.commcare.views.widgets.IntentWidget;
@@ -101,7 +107,12 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.core.app.ActivityCompat;
 
+import static org.commcare.activities.components.FormEntryConstants.DO_NOT_EXIT;
+import static org.commcare.activities.components.FormEntryConstants.EXIT;
 import static org.commcare.android.database.user.models.FormRecord.QuarantineReason_LOCAL_PROCESSING_ERROR;
+import static org.commcare.android.database.user.models.FormRecord.QuarantineReason_RECORD_ERROR;
+import static org.commcare.sync.FirebaseMessagingDataSyncer.PENGING_SYNC_ALERT_ACTION;
+import static org.commcare.tasks.SaveToDiskTask.SaveStatus.SAVE_UNRECOVERABLE_ERROR;
 
 /**
  * Displays questions, animates transitions between
@@ -143,6 +154,7 @@ public class FormEntryActivity extends SaveSessionCommCareActivity<FormEntryActi
     private boolean instanceIsReadOnly = false;
     private boolean hasFormLoadBeenTriggered = false;
     private boolean hasFormLoadFailed = false;
+    private boolean triggeredExit = false;
     private String locationRecieverErrorAction = null;
     private String badLocationXpath = null;
 
@@ -171,15 +183,21 @@ public class FormEntryActivity extends SaveSessionCommCareActivity<FormEntryActi
 
     private boolean fullFormProfilingEnabled = false;
     private EvaluationTraceReporter traceReporter;
+
+    private PendingSyncAlertBroadcastReceiver pendingSyncAlertBroadcastReceiver =
+            new PendingSyncAlertBroadcastReceiver();
+
     private TextToSpeechCallback mTTSCallback = new TextToSpeechCallback() {
         @Override
         public void initFailed() {
-            Toast.makeText(FormEntryActivity.this, Localization.get("tts.init.failed"), Toast.LENGTH_LONG).show();
+            Toast.makeText(FormEntryActivity.this, Localization.get("tts.init.failed"),
+                    Toast.LENGTH_LONG).show();
         }
 
         @Override
         public void speakFailed() {
-            Toast.makeText(FormEntryActivity.this, Localization.get("tts.speak.failed"), Toast.LENGTH_LONG).show();
+            Toast.makeText(FormEntryActivity.this, Localization.get("tts.speak.failed"),
+                    Toast.LENGTH_LONG).show();
         }
 
         @Override
@@ -231,18 +249,26 @@ public void onCreateSessionSafe(Bundle savedInstanceState) {
             uiController.refreshView();
         }
         TextToSpeechConverter.INSTANCE.setListener(mTTSCallback);
+        HiddenPreferences.clearInterruptedSSD();
     }
 
     @Override
-    public void formSaveCallback(Runnable listener) {
+    public void formSaveCallback(boolean sessionExpired, boolean userTriggered, Runnable listener) {
         // note that we have started saving the form
         customFormSaveCallback = listener;
+        interruptAndSaveForm(sessionExpired, userTriggered);
+    }
 
-        // Set flag that will allow us to restore this form when we log back in
-        CommCareApplication.instance().getCurrentSessionWrapper().setCurrentStateAsInterrupted();
+    private void interruptAndSaveForm(boolean sessionExpired, boolean userTriggered) {
+        if (mFormController != null) {
+            // Set flag that will allow us to restore this form when we log back in
+            CommCareApplication.instance().getCurrentSessionWrapper().setCurrentStateAsInterrupted(
+                    mFormController.getFormIndex(), sessionExpired);
 
-        // Start saving form; will trigger expireUserSession() on completion
-        saveIncompleteFormToDisk();
+            // Start saving form; will trigger expireUserSession() on completion
+            boolean exit = sessionExpired ? FormEntryConstants.EXIT : FormEntryConstants.DO_NOT_EXIT;
+            saveIncompleteFormToDisk(exit, userTriggered);
+        }
     }
 
     private void handleLocationErrorAction() {
@@ -271,7 +297,11 @@ public void onReceive(Context context, Intent intent) {
         IntentFilter filter = new IntentFilter();
         filter.addAction(PollSensorAction.XPATH_ERROR_ACTION);
         filter.addAction(GeoUtils.ACTION_LOCATION_ERROR);
-        registerReceiver(mLocationServiceIssueReceiver, filter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(mLocationServiceIssueReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            registerReceiver(mLocationServiceIssueReceiver, filter);
+        }
     }
 
     @Override
@@ -296,7 +326,8 @@ protected void onSaveInstanceState(Bundle outState) {
 
         if (symetricKey != null) {
             try {
-                outState.putString(KEY_AES_STORAGE_KEY, new Base64Wrapper().encodeToString(symetricKey.getEncoded()));
+                outState.putString(KEY_AES_STORAGE_KEY,
+                        new Base64Wrapper().encodeToString(symetricKey.getEncoded()));
             } catch (ClassNotFoundException e) {
                 // we can't really get here anyway, since we couldn't have decoded the string to begin with
                 throw new RuntimeException("Base 64 encoding unavailable! Can't pass storage key");
@@ -325,22 +356,26 @@ public void onActivityResultSessionSafe(int requestCode, int resultCode, Intent
             switch (requestCode) {
                 case FormEntryConstants.INTENT_CALLOUT:
                     if (!processIntentResponse(intent, false)) {
-                        Toast.makeText(this, Localization.get("intent.callout.unable.to.process"), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(this,
+                                Localization.get("intent.callout.unable.to.process"), Toast.LENGTH_SHORT).show();
                     }
                     break;
                 case FormEntryConstants.IMAGE_CAPTURE:
-                    ImageCaptureProcessing.processCaptureResponse(this, FormEntryInstanceState.getInstanceFolder(), true);
+                    ImageCaptureProcessing.processCaptureResponse(this,
+                            FormEntryInstanceState.getInstanceFolder(), true);
                     break;
                 case FormEntryConstants.SIGNATURE_CAPTURE:
                     Logger.log(LogTypes.SOFT_ASSERT, "Signature captured successfully");
-                    boolean saved = ImageCaptureProcessing.processCaptureResponse(this, FormEntryInstanceState.getInstanceFolder(), false);
+                    boolean saved = ImageCaptureProcessing.processCaptureResponse(this,
+                            FormEntryInstanceState.getInstanceFolder(), false);
                     if (saved && !uiController.questionsView.isQuestionList()) {
                         // attempt to auto-advance if a signature was captured
                         advance();
                     }
                     break;
                 case FormEntryConstants.IMAGE_CHOOSER:
-                    ImageCaptureProcessing.processImageChooserResponse(this, FormEntryInstanceState.getInstanceFolder(), intent);
+                    ImageCaptureProcessing.processImageChooserResponse(this,
+                            FormEntryInstanceState.getInstanceFolder(), intent);
                     break;
                 case FormEntryConstants.AUDIO_VIDEO_FETCH:
                     processChooserResponse(intent);
@@ -361,6 +396,13 @@ public void onActivityResultSessionSafe(int requestCode, int resultCode, Intent
                         PollSensorController.INSTANCE.requestLocationUpdates();
                     }
                     break;
+                case FormEntryConstants.VIEW_VIDEO_FULLSCREEN:
+                    if (intent.getExtras().containsKey(
+                            CommCareMediaController.INLINE_VIDEO_TIME_POSITION)) {
+                        positionOfVideoProgress = intent.getIntExtra(
+                                CommCareMediaController.INLINE_VIDEO_TIME_POSITION, 0);
+                    }
+                    break;
             }
         }
         resetPendingCalloutIndex();
@@ -392,8 +434,10 @@ private void processChooserResponse(Intent intent) {
         // then the widget copies the file and makes a new entry in the content provider.
         Uri media = intent.getData();
         if (media == null) {
-            Logger.log(LogTypes.TYPE_ERROR_ASSERTION, "AUDIO_VIDEO_FETCH intent data returns null " + intent.toString());
-            Logger.log(LogTypes.TYPE_ERROR_ASSERTION, "Extras: " + (intent.getExtras() != null ? intent.getExtras().toString() : "null"));
+            Logger.log(LogTypes.TYPE_ERROR_ASSERTION,
+                    "AUDIO_VIDEO_FETCH intent data returns null " + intent.toString());
+            Logger.log(LogTypes.TYPE_ERROR_ASSERTION,
+                    "Extras: " + (intent.getExtras() != null ? intent.getExtras().toString() : "null"));
             uiController.questionsView.clearAnswer();
             Toast.makeText(FormEntryActivity.this,
                     Localization.get("form.attachment.notfound"),
@@ -547,7 +591,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
             case FormEntryConstants.MENU_PREFERENCES:
                 Intent pref = new Intent(this, SessionAwarePreferenceActivity.class);
-                pref.putExtra(CommCarePreferenceActivity.EXTRA_PREF_TYPE, CommCarePreferenceActivity.PREF_TYPE_FORM_ENTRY);
+                pref.putExtra(CommCarePreferenceActivity.EXTRA_PREF_TYPE,
+                        CommCarePreferenceActivity.PREF_TYPE_FORM_ENTRY);
                 startActivityForResult(pref, FormEntryConstants.FORM_PREFERENCES_KEY);
                 return true;
             case android.R.id.home:
@@ -622,7 +667,8 @@ private boolean saveAnswersForCurrentScreen(boolean evaluateConstraints,
                                         (failOnRequired ||
                                                 saveStatus != FormEntryController.ANSWER_REQUIRED_BUT_EMPTY))) {
                             if (!headless) {
-                                uiController.showConstraintWarning(index, mFormController.getQuestionPrompt(index).getConstraintText(), saveStatus, success);
+                                uiController.showConstraintWarning(index,
+                                        mFormController.getQuestionPrompt(index).getConstraintText(), saveStatus, success);
                             }
                             success = false;
                         }
@@ -679,12 +725,14 @@ public boolean onContextItemSelected(MenuItem item) {
     @Override
     public Object onRetainCustomNonConfigurationInstance() {
         // if a form is loading, pass the loader task
-        if (mFormLoaderTask != null && mFormLoaderTask.getStatus() != AsyncTask.Status.FINISHED)
+        if (mFormLoaderTask != null && mFormLoaderTask.getStatus() != AsyncTask.Status.FINISHED) {
             return mFormLoaderTask;
+        }
 
         // if a form is writing to disk, pass the save to disk task
-        if (mSaveToDiskTask != null && mSaveToDiskTask.getStatus() != AsyncTask.Status.FINISHED)
+        if (mSaveToDiskTask != null && mSaveToDiskTask.getStatus() != AsyncTask.Status.FINISHED) {
             return mSaveToDiskTask;
+        }
 
         // mFormEntryController is static so we don't need to pass it.
         if (mFormController != null && currentPromptIsQuestion() && uiController.questionsView != null) {
@@ -727,18 +775,18 @@ protected void fireCompoundIntentDispatch() {
     public void saveFormToDisk(boolean exit) {
         if (formHasLoaded()) {
             boolean isFormComplete = instanceState.isFormRecordComplete();
-            saveDataToDisk(exit, isFormComplete, null, false);
+            saveDataToDisk(exit, isFormComplete, null, false, true);
         } else if (exit) {
             showSaveErrorAndExit();
         }
     }
 
     private void saveCompletedFormToDisk(String updatedSaveName) {
-        saveDataToDisk(FormEntryConstants.EXIT, true, updatedSaveName, false);
+        saveDataToDisk(FormEntryConstants.EXIT, true, updatedSaveName, false, true);
     }
 
-    private void saveIncompleteFormToDisk() {
-        saveDataToDisk(FormEntryConstants.EXIT, false, null, true);
+    private void saveIncompleteFormToDisk(boolean exit, boolean userTriggered) {
+        saveDataToDisk(exit, false, null, true, userTriggered);
     }
 
     /**
@@ -752,7 +800,7 @@ protected void onExternalAttachmentUpdated() {
         }
         String formStatus = formRecord.getStatus();
         if (FormRecord.STATUS_INCOMPLETE.equals(formStatus)) {
-            saveDataToDisk(false, false, null, true);
+            saveDataToDisk(false, false, null, true, false);
         }
     }
 
@@ -772,8 +820,8 @@ private void showSaveErrorAndExit() {
      * @param headless        Disables GUI warnings and lets answers that
      *                        violate constraints be saved.
      */
-    private void saveDataToDisk(boolean exit, boolean complete, String updatedSaveName,
-                                boolean headless) {
+    private void saveDataToDisk(boolean exit, boolean complete, String updatedSaveName, boolean headless,
+                                boolean userTriggered) {
         if (!formHasLoaded()) {
             if (exit) {
                 showSaveErrorAndExit();
@@ -781,6 +829,10 @@ private void saveDataToDisk(boolean exit, boolean complete, String updatedSaveNa
             return;
         }
 
+        if (mFormController.isFormReadOnly()) {
+            return;
+        }
+
         // save current answer; if headless, don't evaluate the constraints
         // before doing so.
         boolean wasScreenSaved =
@@ -800,10 +852,15 @@ private void saveDataToDisk(boolean exit, boolean complete, String updatedSaveNa
             return;
         }
 
+        if (complete) {
+            HiddenPreferences.clearInterruptedFormState();
+            HiddenPreferences.clearInterruptedSSD();
+        }
+
         mSaveToDiskTask = new SaveToDiskTask(getIntent().getIntExtra(KEY_FORM_RECORD_ID, -1),
                 getIntent().getIntExtra(KEY_FORM_DEF_ID, -1),
                 FormEntryInstanceState.mFormRecordPath,
-                exit, complete, updatedSaveName, symetricKey, headless);
+                exit, complete, updatedSaveName, symetricKey, headless, userTriggered);
         if (!headless) {
             mSaveToDiskTask.connect(this);
         }
@@ -812,7 +869,8 @@ private void saveDataToDisk(boolean exit, boolean complete, String updatedSaveNa
     }
 
     public void discardChangesAndExit() {
-        FormFileSystemHelpers.removeMediaAttachedToUnsavedForm(this, FormEntryInstanceState.mFormRecordPath, formRecordStorage);
+        FormFileSystemHelpers.removeMediaAttachedToUnsavedForm(this, FormEntryInstanceState.mFormRecordPath,
+                formRecordStorage);
         finishReturnInstance(false);
     }
 
@@ -861,16 +919,7 @@ protected void onPause() {
             saveAnswersForCurrentScreen(false);
         }
 
-        if (mLocationServiceIssueReceiver != null) {
-            try {
-                unregisterReceiver(mLocationServiceIssueReceiver);
-            } catch (IllegalArgumentException e) {
-                // Thrown when given receiver isn't registered.
-                // This shouldn't ever happen, but seems to come up in production
-                Logger.log(LogTypes.TYPE_ERROR_ASSERTION,
-                        "Tried to unregister a BroadcastReceiver that wasn't registered: " + e.getMessage());
-            }
-        }
+        attemptToUnregisterBroadcastReceiver(mLocationServiceIssueReceiver);
 
         saveInlineVideoState();
 
@@ -878,6 +927,30 @@ protected void onPause() {
             PollSensorController.INSTANCE.stopLocationPolling();
         }
         TextToSpeechConverter.INSTANCE.stop();
+
+        attemptToUnregisterBroadcastReceiver(pendingSyncAlertBroadcastReceiver);
+    }
+
+    private void attemptToUnregisterBroadcastReceiver(BroadcastReceiver broadcastReceiver){
+        if (broadcastReceiver != null) {
+            try {
+                unregisterReceiver(broadcastReceiver);
+            } catch (IllegalArgumentException e) {}
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (shouldSaveFormOnStop()) {
+            interruptAndSaveForm(false, false);
+        }
+    }
+
+    private boolean shouldSaveFormOnStop() {
+        // if feature enabled and the form has loaded and another widget workflow is not in progress and we
+        // ourselves have not called exit as part of user workflow
+        return MainConfigurablePreferences.isAutoSaveFormOnPause() && formHasLoaded() && !triggeredExit;
     }
 
     private void saveInlineVideoState() {
@@ -898,7 +971,8 @@ private void saveInlineVideoState() {
 
     private void restoreInlineVideoState() {
         if (indexOfWidgetWithVideoPlaying != -1) {
-            QuestionWidget widgetWithVideoToResume = uiController.questionsView.getWidgets().get(indexOfWidgetWithVideoPlaying);
+            QuestionWidget widgetWithVideoToResume = uiController.questionsView.getWidgets()
+                    .get(indexOfWidgetWithVideoPlaying);
             VideoView inlineVideo = widgetWithVideoToResume.findViewById(R.id.inline_video_view);
             if (inlineVideo != null) {
                 inlineVideo.seekTo(positionOfVideoProgress);
@@ -925,13 +999,24 @@ public void onResumeSessionSafe() {
         restorePriorStates();
 
         reportVideoUsageIfAny();
+
+        IntentFilter intentFilter = new IntentFilter(PENGING_SYNC_ALERT_ACTION);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter);
+        }
+
+        // Flag that a background sync shouldn't be triggered when this activity is in the foreground
+        CommCareApplication.instance().setBackgroundSyncSafe(false);
     }
 
     private void reportVideoUsageIfAny() {
         if (mFormController != null) {
             FormAnalyticsHelper formAnalyticsHelper = mFormController.getFormAnalyticsHelper();
             if (formAnalyticsHelper.getVideoStartTime() != -1) {
-                FirebaseAnalyticsUtil.reportVideoPlayEvent(formAnalyticsHelper.getVideoName(), formAnalyticsHelper.getVideoDuration(), formAnalyticsHelper.getVideoStartTime());
+                FirebaseAnalyticsUtil.reportVideoPlayEvent(formAnalyticsHelper.getVideoName(),
+                        formAnalyticsHelper.getVideoDuration(), formAnalyticsHelper.getVideoStartTime());
                 formAnalyticsHelper.resetVideoPlaybackInfo();
             }
         }
@@ -948,6 +1033,7 @@ private void restorePriorStates() {
     private void loadForm() {
         mFormController = null;
         instanceState.setFormRecordPath(null);
+        InterruptedFormState savedFormSession = null;
 
         Intent intent = getIntent();
         if (intent != null) {
@@ -955,14 +1041,22 @@ private void loadForm() {
             setTitleToLoading();
             int formId;
             try {
-                SqlStorage<FormDefRecord> formDefStorage = CommCareApplication.instance().getAppStorage(FormDefRecord.class);
+                SqlStorage<FormDefRecord> formDefStorage = CommCareApplication.instance()
+                        .getAppStorage(FormDefRecord.class);
                 if (intent.hasExtra(KEY_FORM_RECORD_ID)) {
-                    Pair<Integer, Boolean> instanceAndStatus = instanceState.getFormDefIdForRecord(
-                            formDefStorage,
-                            intent.getIntExtra(KEY_FORM_RECORD_ID, -1),
-                            instanceState);
+                    int formRecordId = intent.getIntExtra(KEY_FORM_RECORD_ID, -1);
+                    Pair<Integer, Boolean> instanceAndStatus = instanceState.getFormDefIdForRecord(formDefStorage,
+                            formRecordId, instanceState);
+
                     formId = instanceAndStatus.first;
                     instanceIsReadOnly = instanceAndStatus.second;
+
+                    // only retrieve a potentially stored form index when loading an existing form record
+                    savedFormSession = retrieveAndValidateFormIndex(
+                            CommCareApplication.instance().getCurrentSessionWrapper());
+                    if (savedFormSession != null) {
+                        Logger.log(LogTypes.TYPE_FORM_ENTRY, "Recovering form entry session");
+                    }
                 } else if (intent.hasExtra(KEY_FORM_DEF_ID)) {
                     formId = intent.getIntExtra(KEY_FORM_DEF_ID, -1);
                     instanceState.setFormDefPath(FormFileSystemHelpers.getFormDefPath(formDefStorage, formId));
@@ -973,11 +1067,13 @@ private void loadForm() {
                     return;
                 }
             } catch (FormQueryException e) {
-                new UserfacingErrorHandling<>().createErrorDialog(this, e.getMessage(), FormEntryConstants.EXIT);
+                new UserfacingErrorHandling<>().createErrorDialog(this, e.getMessage(),
+                        FormEntryConstants.EXIT);
                 return;
             }
 
-            mFormLoaderTask = new FormLoaderTask<FormEntryActivity>(symetricKey, instanceIsReadOnly, formEntryRestoreSession.isRecording(), FormEntryInstanceState.mFormRecordPath, this) {
+            mFormLoaderTask = new FormLoaderTask<FormEntryActivity>(symetricKey, instanceIsReadOnly,
+                    formEntryRestoreSession.isRecording(), FormEntryInstanceState.mFormRecordPath, this, savedFormSession) {
                 @Override
                 protected void deliverResult(FormEntryActivity receiver, FECWrapper wrapperResult) {
                     receiver.handleFormLoadCompletion(wrapperResult.getController());
@@ -993,15 +1089,20 @@ protected void deliverError(FormEntryActivity receiver, Exception e) {
                     receiver.dismissProgressDialogForTask(taskId);
 
                     if (e != null) {
-                        new UserfacingErrorHandling<>().createErrorDialog(receiver, e.getMessage(), FormEntryConstants.EXIT);
+                        new UserfacingErrorHandling<>().createErrorDialog(receiver,
+                                e.getMessage(), FormEntryConstants.EXIT);
                     } else {
-                        new UserfacingErrorHandling<>().createErrorDialog(receiver, StringUtils.getStringRobust(receiver, R.string.parse_error), FormEntryConstants.EXIT);
+                        new UserfacingErrorHandling<>().createErrorDialog(receiver,
+                                StringUtils.getStringRobust(receiver, R.string.parse_error),
+                                FormEntryConstants.EXIT);
                     }
 
                     if (intent.hasExtra(KEY_FORM_RECORD_ID)) {
                         // log the form record id for which form load has failed
-                        FormRecord formRecord = FormRecord.getFormRecord(formRecordStorage, intent.getIntExtra(KEY_FORM_RECORD_ID, -1));
-                        Logger.log(LogTypes.TYPE_FORM_ENTRY, "Form load failed for form with id " + formRecord.getInstanceID());
+                        FormRecord formRecord = FormRecord.getFormRecord(formRecordStorage,
+                                intent.getIntExtra(KEY_FORM_RECORD_ID, -1));
+                        Logger.log(LogTypes.TYPE_FORM_ENTRY,
+                                "Form load failed for form with id " + formRecord.getInstanceID());
                     }
                 }
             };
@@ -1015,7 +1116,22 @@ protected void deliverError(FormEntryActivity receiver, Exception e) {
         }
     }
 
+    private InterruptedFormState retrieveAndValidateFormIndex(AndroidSessionWrapper androidSessionWrapper) {
+        InterruptedFormState interruptedFormState = HiddenPreferences.getInterruptedFormState();
+        if (interruptedFormState!= null
+                && interruptedFormState.getSessionStateDescriptorId() == androidSessionWrapper.getSessionDescriptorId()
+                && (interruptedFormState.getFormRecordId() == -1
+                || interruptedFormState.getFormRecordId() == androidSessionWrapper.getFormRecordId())) {
+            return interruptedFormState;
+        }
+        // data format is invalid, so better to clear the data
+        HiddenPreferences.clearInterruptedFormState();
+        return null;
+    }
+
     private void handleFormLoadCompletion(AndroidFormController fc) {
+        HiddenPreferences.clearInterruptedFormState();
+
         if (PollSensorAction.XPATH_ERROR_ACTION.equals(locationRecieverErrorAction)) {
             handleXpathErrorBroadcast();
         }
@@ -1044,16 +1160,25 @@ private void handleFormLoadCompletion(AndroidFormController fc) {
 
         formEntryRestoreSession.replaySession(this);
 
+        // jump to form index, no action if null
+        mFormController.returnToStoredIndex();
+
         uiController.refreshView();
         FormNavigationUI.updateNavigationCues(this, mFormController, uiController.questionsView);
         if (isRestartAfterSessionExpiration) {
-            Toast.makeText(this, Localization.get("form.entry.restart.after.expiration"), Toast.LENGTH_LONG).show();
+            // InterruptedFormState null check is important to ensure backward compatibility
+            String localeKey =
+                    (fc.getInterruptedFormState() == null
+                            || fc.getInterruptedFormState().isInterruptedDueToSessionExpiration())
+                    ? "form.entry.restart.after.expiration" : "form.entry.restart.after.session.pause";
+            Toast.makeText(this, Localization.get(localeKey), Toast.LENGTH_LONG).show();
         }
     }
 
     private void handleXpathErrorBroadcast() {
         new UserfacingErrorHandling<>().createErrorDialog(FormEntryActivity.this,
-                "There is a bug in one of your form's XPath Expressions \n" + badLocationXpath, FormEntryConstants.EXIT);
+                "There is a bug in one of your form's XPath Expressions \n" + badLocationXpath,
+                FormEntryConstants.EXIT);
     }
 
     /**
@@ -1158,7 +1283,7 @@ private void registerSessionFormSaveCallback() {
      * continue closing the session/logging out.
      */
     @Override
-    public void savingComplete(SaveToDiskTask.SaveStatus saveStatus, String errorMessage) {
+    public void savingComplete(SaveToDiskTask.SaveStatus saveStatus, String errorMessage, boolean exit, boolean userTriggered) {
         // Did we just save a form because the key session
         // (CommCareSessionService) is ending?
         if (customFormSaveCallback != null) {
@@ -1166,7 +1291,9 @@ public void savingComplete(SaveToDiskTask.SaveStatus saveStatus, String errorMes
             customFormSaveCallback = null;
 
             toCall.run();
-            returnAsInterrupted();
+            if (exit) {
+                returnAsInterrupted();
+            }
         } else if (saveStatus != null) {
             String toastMessage = "";
             switch (saveStatus) {
@@ -1175,13 +1302,16 @@ public void savingComplete(SaveToDiskTask.SaveStatus saveStatus, String errorMes
                     hasSaved = true;
                     break;
                 case SAVED_INCOMPLETE:
-                    toastMessage = Localization.get("form.entry.incomplete.save.success");
+                    if (userTriggered) {
+                        toastMessage = Localization.get("form.entry.incomplete.save.success");
+                    }
                     hasSaved = true;
                     break;
                 case SAVED_AND_EXIT:
                     hasSaved = true;
                     if (!CommCareApplication.instance().isConsumerApp()) {
-                        Toast.makeText(this, Localization.get("form.entry.complete.save.success"), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(this,
+                                Localization.get("form.entry.complete.save.success"), Toast.LENGTH_SHORT).show();
                     }
                     finishReturnInstance();
                     return;
@@ -1191,12 +1321,15 @@ public void savingComplete(SaveToDiskTask.SaveStatus saveStatus, String errorMes
                     uiController.refreshView();
                     saveAnswersForCurrentScreen(true);
                     return;
-                case SAVE_ERROR:
+                case SAVE_ERROR, SAVE_UNRECOVERABLE_ERROR:
                     if (!CommCareApplication.instance().isConsumerApp()) {
                         new UserfacingErrorHandling<>().createErrorDialog(this, errorMessage,
-                                Localization.get("notification.formentry.save_error.title"), FormEntryConstants.EXIT);
+                                Localization.get("notification.formentry.save_error.title"),
+                                FormEntryConstants.EXIT);
                     }
-                    quarantineRecordOnError(errorMessage);
+                    String reasonType = (saveStatus == SAVE_UNRECOVERABLE_ERROR) ?
+                            QuarantineReason_LOCAL_PROCESSING_ERROR : QuarantineReason_RECORD_ERROR;
+                    quarantineRecordOnError(errorMessage, reasonType);
                     return;
             }
             if (!"".equals(toastMessage) && !CommCareApplication.instance().isConsumerApp()) {
@@ -1207,17 +1340,13 @@ public void savingComplete(SaveToDiskTask.SaveStatus saveStatus, String errorMes
     }
 
     // clean the form record in case it was saved
-    private void quarantineRecordOnError(String errorMessage) {
+    private void quarantineRecordOnError(String errorMessage, String reasonType) {
         AndroidSessionWrapper currentState = CommCareApplication.instance().getCurrentSessionWrapper();
         FormRecord toBeQuarantined = currentState.getFormRecord();
 
         // quarantine in case the form record was saved
         if (toBeQuarantined != null) {
-            new FormRecordProcessor(this).quarantineRecord(
-                    toBeQuarantined,
-                    QuarantineReason_LOCAL_PROCESSING_ERROR,
-                    errorMessage
-            );
+            new FormRecordProcessor(this).quarantineRecord(toBeQuarantined, reasonType, errorMessage);
         }
     }
 
@@ -1263,6 +1392,9 @@ private void finishReturnInstance() {
      *                    activity
      */
     private void finishReturnInstance(boolean reportSaved) {
+        HiddenPreferences.clearInterruptedFormState();
+        HiddenPreferences.clearInterruptedSSD();
+
         String action = getIntent().getAction();
         if (Intent.ACTION_PICK.equals(action) || Intent.ACTION_EDIT.equals(action)) {
             Intent formReturnIntent = new Intent();
@@ -1292,6 +1424,7 @@ private void finishReturnInstance(boolean reportSaved) {
 
         dismissCurrentProgressDialog();
         reportFormExitTime();
+        triggeredExit = true;
         finish();
     }
 
@@ -1442,7 +1575,8 @@ private void setTitleToLoading() {
         if (mHeaderString != null) {
             setTitle(mHeaderString);
         } else {
-            setTitle(StringUtils.getStringRobust(this, R.string.application_name) + " > " + StringUtils.getStringRobust(this, R.string.loading_form));
+            setTitle(StringUtils.getStringRobust(this, R.string.application_name) + " > " +
+                    StringUtils.getStringRobust(this, R.string.loading_form));
         }
     }
 
@@ -1451,7 +1585,8 @@ protected String getHeaderString() {
             //Localization?
             return mHeaderString;
         } else {
-            return StringUtils.getStringRobust(this, R.string.application_name) + " > " + FormEntryActivity.mFormController.getFormTitle();
+            return StringUtils.getStringRobust(this, R.string.application_name) + " > " +
+                    FormEntryActivity.mFormController.getFormTitle();
         }
     }
 
@@ -1469,7 +1604,7 @@ public void requestNeededPermissions(int requestCode) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode,
-                                           String permissions[], int[] grantResults) {
+                                           String[] permissions, int[] grantResults) {
         switch (requestCode) {
             case ImageWidget.REQUEST_CAMERA_PERMISSION: {
 
@@ -1499,6 +1634,25 @@ public void onRequestPermissionsResult(int requestCode,
         }
     }
 
+    @Override
+    public void alertPendingSync(FCMMessageData fcmMessageData) {
+        if (!HiddenPreferences.isPendingSyncRequest(fcmMessageData.getUsername())) {
+            HiddenPreferences.setPendingSyncRequest(fcmMessageData);
+
+            if (!HiddenPreferences.isPendingSyncDialogDisabled()) {
+                StandardAlertDialog dialog = StandardAlertDialog.getBasicAlertDialogWithDisablingCheckbox(this,
+                        Localization.get("background.sync.pending.form.entry.title"),
+                        Localization.get("background.sync.pending.form.entry.detail"), (buttonView, isChecked) -> {
+                            HiddenPreferences.setPendingSyncDialogDisabled(isChecked);
+                        });
+                dialog.setPositiveButton(Localization.get("dialog.ok"), (dialog1, which) -> {
+                    dialog1.dismiss();
+                });
+                showAlertDialog(dialog);
+            }
+        }
+    }
+
 
     public static class FormQueryException extends Exception {
         public FormQueryException(String msg) {
diff --git a/app/src/org/commcare/activities/FormEntryActivityUIController.java b/app/src/org/commcare/activities/FormEntryActivityUIController.java
index f917a62542..fc4ff0d9b9 100644
--- a/app/src/org/commcare/activities/FormEntryActivityUIController.java
+++ b/app/src/org/commcare/activities/FormEntryActivityUIController.java
@@ -49,6 +49,7 @@
 import org.javarosa.core.model.data.InvalidData;
 import org.javarosa.core.services.Logger;
 import org.javarosa.core.services.locale.Localization;
+import org.javarosa.form.api.FormEntryCaption;
 import org.javarosa.form.api.FormEntryController;
 import org.javarosa.form.api.FormEntryPrompt;
 import org.javarosa.xpath.XPathException;
@@ -82,6 +83,7 @@ public class FormEntryActivityUIController implements CommCareActivityUIControll
     private boolean formRelevanciesUpdateInProgress = false;
 
     private static final String KEY_LAST_CHANGED_WIDGET = "index-of-last-changed-widget";
+    private TextView finishText;
 
     enum AnimationType {
         LEFT, RIGHT, FADE
@@ -103,7 +105,7 @@ public void setupUI() {
 
         View finishButton = activity.findViewById(R.id.nav_btn_finish);
 
-        TextView finishText = finishButton.findViewById(R.id.nav_btn_finish_text);
+        finishText = finishButton.findViewById(R.id.nav_btn_finish_text);
         finishText.setText(Localization.get("form.entry.finish.button").toUpperCase());
 
         nextButton.setOnClickListener(v -> {
@@ -199,6 +201,10 @@ protected void refreshCurrentView(boolean animateLastView) {
             QuestionsView current = createView();
             showView(current, AnimationType.FADE, animateLastView);
         }
+
+        if (finishText != null && FormEntryActivity.mFormController.isFormReadOnly()) {
+            finishText.setText(Localization.get("form.entry.exit.button").toUpperCase());
+        }
     }
 
     /**
@@ -493,24 +499,25 @@ private void createRepeatDialog() {
         final boolean backExitsForm = !details.relevantBeforeCurrentScreen;
         final boolean nextExitsForm = details.relevantAfterCurrentScreen == 0;
 
+        final FormEntryCaption repeatCaptionPrompt = FormEntryActivity.mFormController.getCaptionPrompt();
+
         // Assign title and text strings based on the current state
         String backText = Localization.get("repeat.dialog.go.back");
-        String addAnotherText = Localization.get("repeat.dialog.add");
-        String title, skipText;
+
+        boolean hasRepetitions = FormEntryActivity.mFormController.getLastRepeatCount() > 0;
+        final String addAnotherText = repeatCaptionPrompt.getRepeatText(hasRepetitions ? "add" : "add-empty");
+
+        String skipText;
+
         if (!nextExitsForm) {
             skipText = Localization.get("repeat.dialog.leave");
         } else {
             skipText = Localization.get("repeat.dialog.exit");
         }
-        if (FormEntryActivity.mFormController.getLastRepeatCount() > 0) {
-            title = Localization.get("repeat.dialog.add.another", FormEntryActivity.mFormController.getLastGroupText());
-        } else {
-            title = Localization.get("repeat.dialog.add.new", FormEntryActivity.mFormController.getLastGroupText());
-        }
 
         // Create the choice dialog
         ContextThemeWrapper wrapper = new ContextThemeWrapper(activity, R.style.DialogBaseTheme);
-        final PaneledChoiceDialog dialog = new HorizontalPaneledChoiceDialog(wrapper, title);
+        final PaneledChoiceDialog dialog = new HorizontalPaneledChoiceDialog(wrapper, addAnotherText);
 
         // Panel 1: Back option
         View.OnClickListener backListener = v -> {
diff --git a/app/src/org/commcare/activities/FullscreenVideoViewActivity.kt b/app/src/org/commcare/activities/FullscreenVideoViewActivity.kt
new file mode 100644
index 0000000000..0f9f84647b
--- /dev/null
+++ b/app/src/org/commcare/activities/FullscreenVideoViewActivity.kt
@@ -0,0 +1,85 @@
+package org.commcare.activities
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.commcare.dalvik.databinding.ActivityFullscreenVideoViewBinding
+import org.commcare.views.media.CommCareMediaController
+
+/**
+ * Activity to view inline videos in fullscreen mode, it returns the last time position to the
+ * calling activity
+ *
+ * @author avazirna
+ */
+class FullscreenVideoViewActivity : AppCompatActivity() {
+
+    private lateinit var viewBinding: ActivityFullscreenVideoViewBinding
+    private var lastPosition = -1
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewBinding = ActivityFullscreenVideoViewBinding.inflate(layoutInflater)
+        setContentView(viewBinding.root)
+
+        // Get video URI from intent, crash if no URI is available
+        intent.data?.let { viewBinding.fullscreenVideoView.setVideoURI(intent.data) }
+            ?: throw RuntimeException("Video file not found!");
+        lastPosition = restoreLastPosition(savedInstanceState)
+
+        viewBinding.fullscreenVideoView.setMediaController(CommCareMediaController(this, true))
+        viewBinding.fullscreenVideoView.setOnPreparedListener {
+            if (lastPosition != -1) {
+                viewBinding.fullscreenVideoView.seekTo(lastPosition)
+            }
+            viewBinding.fullscreenVideoView.start()
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        if (lastPosition != -1) {
+            outState.putInt(CommCareMediaController.INLINE_VIDEO_TIME_POSITION, lastPosition)
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (viewBinding.fullscreenVideoView != null) {
+            viewBinding.fullscreenVideoView.pause()
+            lastPosition = viewBinding.fullscreenVideoView.currentPosition
+        }
+    }
+
+    override fun onBackPressed() {
+        setResultIntent()
+        super.onBackPressed()
+    }
+
+    private fun setResultIntent() {
+        val i = Intent()
+        i.putExtra(
+            CommCareMediaController.INLINE_VIDEO_TIME_POSITION,
+            viewBinding.fullscreenVideoView.currentPosition
+        )
+        this.setResult(RESULT_OK, i)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        viewBinding.fullscreenVideoView.stopPlayback()
+    }
+
+    // priority is given to lastPosition saved state
+    private fun restoreLastPosition(savedInstanceState: Bundle?): Int {
+        val intentExtras = intent.extras
+        if (savedInstanceState != null &&
+            savedInstanceState.containsKey(CommCareMediaController.INLINE_VIDEO_TIME_POSITION)) {
+            return savedInstanceState.getInt(CommCareMediaController.INLINE_VIDEO_TIME_POSITION)
+        } else if (intentExtras != null &&
+            intentExtras.containsKey(CommCareMediaController.INLINE_VIDEO_TIME_POSITION)) {
+            return intentExtras.getInt(CommCareMediaController.INLINE_VIDEO_TIME_POSITION)
+        }
+        return -1
+    }
+}
diff --git a/app/src/org/commcare/activities/HomeButtons.java b/app/src/org/commcare/activities/HomeButtons.java
index f1d8b33d3e..a9904f9472 100644
--- a/app/src/org/commcare/activities/HomeButtons.java
+++ b/app/src/org/commcare/activities/HomeButtons.java
@@ -4,12 +4,14 @@
 import android.content.Intent;
 import android.text.Spannable;
 import android.view.View;
+import android.widget.Toast;
 
 import org.commcare.adapters.HomeCardDisplayData;
 import org.commcare.adapters.SquareButtonViewHolder;
 import org.commcare.dalvik.R;
 import org.commcare.google.services.analytics.AnalyticsParamValue;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
+import org.commcare.services.CommCareSessionService;
 import org.commcare.utils.SessionUnavailableException;
 import org.commcare.utils.StorageUtils;
 import org.commcare.utils.SyncDetailCalculations;
@@ -49,7 +51,7 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get(homeMessageKey),
                         R.color.white,
                         R.drawable.home_start,
-                        R.color.cc_attention_positive_color,
+                        R.color.start_home_button,
                         getStartButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get("training.root.title"), R.color.white,
                         R.drawable.home_training, R.color.cc_dark_cool_accent_color,
@@ -57,19 +59,19 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get("home.forms.saved"),
                         R.color.white,
                         R.drawable.home_saved,
-                        R.color.cc_light_cool_accent_color,
+                        R.color.start_save_button,
                         getViewOldFormsListener(activity)),
                 HomeCardDisplayData.homeCardDataWithDynamicText(Localization.get("home.forms.incomplete"), R.color.white,
                         R.drawable.home_incomplete,
-                        R.color.solid_dark_orange,
+                        R.color.red_incomplete,
                         getIncompleteButtonListener(activity),
                         null,
                         getIncompleteButtonTextSetter(activity)),
                 HomeCardDisplayData.homeCardDataWithNotification(Localization.get(syncKey), R.color.white,
                         R.color.white,
                         R.drawable.home_sync,
-                        R.color.cc_brand_color,
-                        R.color.cc_brand_text,
+                        R.color.start_sync_button,
+                        R.color.start_sync_dark_button,
                         getSyncButtonListener(activity),
                         getSyncButtonSubTextListener(activity),
                         getSyncButtonTextSetter(activity)),
@@ -78,7 +80,7 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                         getReportButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithNotification(Localization.get(logoutMessageKey), R.color.white,
                         R.color.white,
-                        R.drawable.home_logout, R.color.cc_neutral_color, R.color.cc_neutral_text,
+                        R.drawable.home_logout, R.color.start_logout_button, R.color.cc_neutral_text,
                         getLogoutButtonListener(activity),
                         null,
                         getLogoutButtonTextSetter(activity)),
@@ -110,6 +112,10 @@ private static View.OnClickListener getViewOldFormsListener(final StandardHomeAc
 
     private static View.OnClickListener getSyncButtonListener(final StandardHomeActivity activity) {
         return v -> {
+            if (CommCareSessionService.sessionAliveLock.isLocked()) {
+                Toast.makeText(activity, Localization.get("background.sync.user.sync.attempt.during.sync"), Toast.LENGTH_LONG).show();
+                return;
+            }
             reportButtonClick(AnalyticsParamValue.SYNC_BUTTON);
             activity.syncButtonPressed();
         };
@@ -124,7 +130,14 @@ private static View.OnClickListener getSyncButtonSubTextListener(final StandardH
 
     private static TextSetter getSyncButtonTextSetter(final StandardHomeActivity activity) {
         return (cardDisplayData, squareButtonViewHolder, context, notificationText) -> {
-            SyncDetailCalculations.updateSubText(activity, squareButtonViewHolder, cardDisplayData, notificationText);
+            try {
+                SyncDetailCalculations.updateSubText(activity, squareButtonViewHolder, cardDisplayData,
+                        notificationText);
+            } catch (SessionUnavailableException e) {
+                // stop button setup, since redirection to login is imminent
+                return;
+            }
+
             squareButtonViewHolder.subTextView.setBackgroundColor(activity.getResources().getColor(cardDisplayData.subTextBgColor));
             squareButtonViewHolder.textView.setTextColor(context.getResources().getColor(cardDisplayData.textColor));
             squareButtonViewHolder.textView.setText(cardDisplayData.text);
diff --git a/app/src/org/commcare/activities/HomeNavDrawerController.java b/app/src/org/commcare/activities/HomeNavDrawerController.java
index 423b530557..c220627042 100644
--- a/app/src/org/commcare/activities/HomeNavDrawerController.java
+++ b/app/src/org/commcare/activities/HomeNavDrawerController.java
@@ -1,7 +1,5 @@
 package org.commcare.activities;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.os.Bundle;
 import android.widget.ListView;
 
@@ -37,6 +35,7 @@ public class HomeNavDrawerController {
     private static final String LOGOUT_DRAWER_ITEM_ID = "home-logout";
     private static final String TRAINING_DRAWER_ITEM_ID = "training";
     private static final String UPDATE_CC_DRAWER_ITEM_ID = "update-cc";
+    private static final String INCOMPLETE_FORMS_ITEM_ID = "incomplete-forms";
 
     protected static final String KEY_DRAWER_WAS_OPEN = "drawer-open-before-rotation";
 
@@ -105,17 +104,21 @@ private void initDrawerItemsMap() {
     private void determineDrawerItemsToInclude() {
         boolean hideSavedFormsItem = !HiddenPreferences.isSavedFormsEnabled();
         boolean hideChangeLanguageItem = ChangeLocaleUtil.getLocaleNames().length <= 1;
+        boolean hideTrainingItem = !CommCareApplication.instance().getCurrentApp().hasVisibleTrainingContent();
+        boolean hideIncompleteFormsItem = !HiddenPreferences.isIncompleteFormsEnabled();
         int numItemsToInclude = allDrawerItems.size()
                 - (hideChangeLanguageItem ? 1 : 0)
                 - (hideSavedFormsItem ? 1 : 0)
+                - (hideTrainingItem ? 1 : 0)
+                - (hideIncompleteFormsItem ? 1 : 0)
                 - (activity.showCommCareUpdateMenu ? 0 : 1);
-        boolean hideTrainingItem = !CommCareApplication.instance().getCurrentApp().hasVisibleTrainingContent();
 
         drawerItemsShowing = new NavDrawerItem[numItemsToInclude];
         int index = 0;
         for (String id : getAllItemIdsInOrder()) {
             NavDrawerItem item = allDrawerItems.get(id);
-            if (!excludeItem(id, hideChangeLanguageItem, hideSavedFormsItem, hideTrainingItem, !activity.showCommCareUpdateMenu)) {
+            if (!excludeItem(id, hideChangeLanguageItem, hideSavedFormsItem, hideTrainingItem,
+                    !activity.showCommCareUpdateMenu, hideIncompleteFormsItem)) {
                 drawerItemsShowing[index] = item;
                 index++;
             }
@@ -123,9 +126,11 @@ private void determineDrawerItemsToInclude() {
     }
 
     private boolean excludeItem(String itemId, boolean hideChangeLanguageItem,
-                                boolean hideSavedFormsItem, boolean hideTrainingItem, boolean hideCCUpdateItem) {
+                                boolean hideSavedFormsItem, boolean hideTrainingItem, boolean hideCCUpdateItem,
+                                boolean hideIncompleteFormsItem) {
         return (itemId.equals(CHANGE_LANGUAGE_DRAWER_ITEM_ID) && hideChangeLanguageItem) ||
                 (itemId.equals(SAVED_FORMS_ITEM_ID) && hideSavedFormsItem) ||
+                (itemId.equals(INCOMPLETE_FORMS_ITEM_ID) && hideIncompleteFormsItem) ||
                 (itemId.equals(TRAINING_DRAWER_ITEM_ID) && hideTrainingItem) ||
                 (itemId.equals(UPDATE_CC_DRAWER_ITEM_ID) && hideCCUpdateItem);
     }
@@ -164,6 +169,9 @@ private ListView.OnItemClickListener getNavDrawerClickListener() {
                 case UPDATE_CC_DRAWER_ITEM_ID:
                     activity.startCommCareUpdate();
                     break;
+                case INCOMPLETE_FORMS_ITEM_ID:
+                    activity.goToFormArchive(true);
+                    break;
             }
         };
     }
@@ -172,7 +180,8 @@ private static String[] getAllItemIdsInOrder() {
         return new String[]{
                 ABOUT_CC_DRAWER_ITEM_ID, TRAINING_DRAWER_ITEM_ID, SETTINGS_DRAWER_ITEM_ID,
                 ADVANCED_DRAWER_ITEM_ID, CHANGE_LANGUAGE_DRAWER_ITEM_ID, SAVED_FORMS_ITEM_ID,
-                UPDATE_DRAWER_ITEM_ID, SYNC_DRAWER_ITEM_ID, UPDATE_CC_DRAWER_ITEM_ID, LOGOUT_DRAWER_ITEM_ID};
+                INCOMPLETE_FORMS_ITEM_ID, UPDATE_DRAWER_ITEM_ID, SYNC_DRAWER_ITEM_ID, UPDATE_CC_DRAWER_ITEM_ID,
+                LOGOUT_DRAWER_ITEM_ID};
     }
 
     private static String getItemTitle(String id) {
@@ -191,6 +200,8 @@ private static String getItemTitle(String id) {
                 return Localization.get("home.sync");
             case SAVED_FORMS_ITEM_ID:
                 return Localization.get("home.menu.saved.forms");
+            case INCOMPLETE_FORMS_ITEM_ID:
+                return Localization.get("app.workflow.incomplete.heading");
             case LOGOUT_DRAWER_ITEM_ID:
                 return Localization.get("home.logout");
             case TRAINING_DRAWER_ITEM_ID:
@@ -217,10 +228,14 @@ private static int getItemIcon(String id) {
                 return R.drawable.ic_sync_nav_drawer;
             case SAVED_FORMS_ITEM_ID:
                 return R.drawable.ic_saved_forms_nav_drawer;
+            case INCOMPLETE_FORMS_ITEM_ID:
+                return R.drawable.incomplete_nav_drawer;
             case LOGOUT_DRAWER_ITEM_ID:
                 return R.drawable.ic_logout_nav_drawer;
             case TRAINING_DRAWER_ITEM_ID:
                 return R.drawable.ic_training_nav_drawer;
+            case UPDATE_CC_DRAWER_ITEM_ID:
+                return R.drawable.ic_cc_update;
         }
         return -1;
     }
diff --git a/app/src/org/commcare/activities/HomeScreenBaseActivity.java b/app/src/org/commcare/activities/HomeScreenBaseActivity.java
index 0bec1f2680..fdac431f72 100644
--- a/app/src/org/commcare/activities/HomeScreenBaseActivity.java
+++ b/app/src/org/commcare/activities/HomeScreenBaseActivity.java
@@ -9,13 +9,13 @@
 import static org.commcare.activities.DriftHelper.getDriftDialog;
 import static org.commcare.activities.DriftHelper.shouldShowDriftWarning;
 import static org.commcare.activities.DriftHelper.updateLastDriftWarningTime;
+import static org.commcare.activities.EntitySelectActivity.EXTRA_ENTITY_KEY;
 import static org.commcare.appupdate.AppUpdateController.IN_APP_UPDATE_REQUEST_CODE;
 
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Base64;
 import android.widget.AdapterView;
@@ -42,7 +42,6 @@
 import org.commcare.core.process.CommCareInstanceInitializer;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.dalvik.R;
-import org.commcare.google.services.ads.AdMobManager;
 import org.commcare.google.services.analytics.AnalyticsParamValue;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.heartbeat.UpdatePromptHelper;
@@ -55,6 +54,7 @@
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.preferences.MainConfigurablePreferences;
 import org.commcare.recovery.measures.RecoveryMeasuresHelper;
+import org.commcare.services.CommCareSessionService;
 import org.commcare.session.CommCareSession;
 import org.commcare.session.SessionFrame;
 import org.commcare.session.SessionNavigationResponder;
@@ -69,6 +69,7 @@
 import org.commcare.suite.model.SessionDatum;
 import org.commcare.suite.model.StackFrameStep;
 import org.commcare.suite.model.Text;
+import org.commcare.sync.FirebaseMessagingDataSyncer;
 import org.commcare.tasks.DataPullTask;
 import org.commcare.tasks.FormLoaderTask;
 import org.commcare.tasks.FormRecordCleanupTask;
@@ -107,6 +108,7 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Vector;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Manages all of the shared (mostly non-UI) components of a CommCare home screen: activity
@@ -168,12 +170,26 @@ public abstract class HomeScreenBaseActivity<T> extends SyncCapableCommCareActiv
     protected boolean showCommCareUpdateMenu = false;
     private static final int MAX_CC_UPDATE_CANCELLATION = 3;
 
+    // This is to trigger a background sync after a form submission,
+    private boolean shouldTriggerBackgroundSync = true;
+
+    // This is to restore the selected entity when restarting EntityDetailActivity after a
+    // background sync
+    private String selectedEntityPostSync = null;
+
+    private FirebaseMessagingDataSyncer dataSyncer;
+
+    {
+        dataSyncer = new FirebaseMessagingDataSyncer(this);
+
+    }
+
     @Override
     public void onCreateSessionSafe(Bundle savedInstanceState) {
         super.onCreateSessionSafe(savedInstanceState);
         loadInstanceState(savedInstanceState);
         CrashUtil.registerAppData();
-        AdMobManager.initAdsForCurrentConsumerApp(getApplicationContext());
+
         updateLastSuccessfulCommCareVersion();
         sessionNavigator = new SessionNavigator(this);
 
@@ -335,6 +351,15 @@ private boolean doLoginLaunchChecksInOrder() {
             return true;
         }
 
+        // In case a sync request from FCM was made while the user was logged out, this will
+        // trigger a blocking sync
+        String username = CommCareApplication.instance().getSession().getLoggedInUser().getUsername();
+        if (HiddenPreferences.isPendingSyncRequest(username)) {
+            sendFormsOrSync(false);
+
+            return true;
+        }
+
         if (UpdatePromptHelper.promptForUpdateIfNeeded(this)) {
             return true;
         }
@@ -380,6 +405,8 @@ private boolean showUpdateInfoForm() {
     private void clearOneTimeLoginActionFlags() {
         HiddenPreferences.setPostUpdateSyncNeeded(false);
         HiddenPreferences.clearInterruptedSSD();
+        String username = CommCareApplication.instance().getSession().getLoggedInUser().getUsername();
+        HiddenPreferences.clearPendingSyncRequest(username);
     }
 
     private boolean tryRestoringFormFromSessionExpiration() {
@@ -388,6 +415,12 @@ private boolean tryRestoringFormFromSessionExpiration() {
         if (existing != null) {
             AndroidSessionWrapper state = CommCareApplication.instance().getCurrentSessionWrapper();
             state.loadFromStateDescription(existing);
+
+            FormRecord formRecord = state.getFormRecord();
+            //TODO: Temporary for GD, to remove
+            Logger.log(LogTypes.TYPE_FORM_ENTRY, "Restoring form from expired Session |" +
+                    (formRecord.getInstanceID() == null ? "" : formRecord.getInstanceID() + "|") +
+                    formRecord.getFormNamespace());
             formEntry(CommCareApplication.instance().getCommCarePlatform()
                             .getFormDefId(state.getSession().getForm()), state.getFormRecord(),
                     null, true);
@@ -533,6 +566,10 @@ protected void goToFormArchive(boolean incomplete, FormRecord record) {
     }
 
     protected void userTriggeredLogout() {
+        if (CommCareSessionService.sessionAliveLock.isLocked()) {
+            Toast.makeText(this, Localization.get("background.sync.logout.attempt.during.sync"), Toast.LENGTH_LONG).show();
+            return;
+        }
         CommCareApplication.instance().closeUserSession();
         setResult(RESULT_OK);
         finish();
@@ -548,6 +585,13 @@ protected void onSaveInstanceState(Bundle outState) {
     @Override
     public void onActivityResultSessionSafe(int requestCode, int resultCode, Intent intent) {
         if (resultCode == RESULT_RESTART) {
+            if (intent != null && intent.hasExtra(EXTRA_ENTITY_KEY))
+                selectedEntityPostSync = intent.getStringExtra(EXTRA_ENTITY_KEY);
+
+            // Reset the AndroidInstanceInitializer to force the eval context to be rebuilt
+            // during restart
+            CommCareApplication.instance().getCurrentSessionWrapper().cleanVolatiles();
+
             startNextSessionStepSafe();
         } else {
             // if handling new return code (want to return to home screen) but a return at the
@@ -594,6 +638,11 @@ int record = intent.getIntExtra("FORMRECORDS", -1);
 
                         AndroidCommCarePlatform platform =
                                 CommCareApplication.instance().getCommCarePlatform();
+
+                        //TODO: Temporary for GD, to remove
+                        Logger.log(LogTypes.TYPE_FORM_ENTRY, "Loading an incomplete form |" +
+                                (r.getInstanceID() == null ? "" : r.getInstanceID() + "|") +
+                                r.getFormNamespace());
                         formEntry(platform.getFormDefId(r.getFormNamespace()), r);
                         return;
                     }
@@ -1006,9 +1055,18 @@ public void processSessionResponse(int statusCode) {
                 FirebaseAnalyticsUtil.reportFeatureUsage(
                         AnalyticsParamValue.FEATURE_CASE_AUTOSELECT);
                 break;
+            case SessionNavigator.FORM_ENTRY_ATTEMPT_DURING_SYNC:
+                handleFormEntryAttemptDuringSync(asw);
+                break;
         }
     }
 
+    private void handleFormEntryAttemptDuringSync(AndroidSessionWrapper asw) {
+        sessionNavigator.stepBack();
+        sessionNavigator.startNextSessionStep();
+        Toast.makeText(this, Localization.get("background.sync.form.entry.attempt.during.sync"), Toast.LENGTH_LONG).show();
+    }
+
     @Override
     public CommCareSession getSessionForNavigator() {
         return CommCareApplication.instance().getCurrentSession();
@@ -1083,7 +1141,11 @@ private Intent getSelectIntent(CommCareSession session) {
         i.putExtra(SessionFrame.STATE_COMMAND_ID, session.getCommand());
         StackFrameStep lastPopped = session.getPoppedStep();
         if (lastPopped != null && SessionFrame.STATE_DATUM_VAL.equals(lastPopped.getType())) {
-            i.putExtra(EntitySelectActivity.EXTRA_ENTITY_KEY, lastPopped.getValue());
+            i.putExtra(EXTRA_ENTITY_KEY, lastPopped.getValue());
+        }
+        if (selectedEntityPostSync != null) {
+            i.putExtra(EXTRA_ENTITY_KEY, selectedEntityPostSync);
+            selectedEntityPostSync = null;
         }
         addPendingDataExtra(i, session);
         addPendingDatumIdExtra(i, session);
@@ -1117,7 +1179,7 @@ && getResources().getConfiguration().orientation
                 Intent i = getSelectIntent(session);
                 String caseId = DatumUtil.getReturnValueFromSelection(
                         contextRef, entityDatum, asw.getEvaluationContext());
-                i.putExtra(EntitySelectActivity.EXTRA_ENTITY_KEY, caseId);
+                i.putExtra(EXTRA_ENTITY_KEY, caseId);
                 startActivityForResult(i, GET_CASE);
             } else {
                 // Launch entity detail activity
@@ -1182,7 +1244,11 @@ private void formEntry(int formDefId, FormRecord r) {
     }
 
     private void formEntry(int formDefId, FormRecord r, String headerTitle,
-            boolean isRestartAfterSessionExpiration) {
+                           boolean isRestartAfterSessionExpiration) {
+
+        // Block any background syncs during a form entry
+        shouldTriggerBackgroundSync = false;
+
         Logger.log(LogTypes.TYPE_FORM_ENTRY, "Form Entry Starting|" +
                 (r.getInstanceID() == null ? "" : r.getInstanceID() + "|") +
                 r.getFormNamespace());
@@ -1249,9 +1315,16 @@ public void onResumeSessionSafe() {
             attemptDispatchHomeScreen();
         }
 
+        // In case a Sync was blocked because of a form entry, trigger now if it's safe
+        String username = CommCareApplication.instance().getSession().getLoggedInUser().getUsername();
+        if (HiddenPreferences.isPendingSyncRequest(username) && shouldTriggerBackgroundSync) {
+            dataSyncer.syncData(HiddenPreferences.getPendingSyncRequest(username));
+        }
+
         // reset these
         redirectedInOnCreate = false;
         sessionNavigationProceedingAfterOnResume = false;
+        shouldTriggerBackgroundSync = true;
     }
 
     private void attemptDispatchHomeScreen() {
@@ -1300,7 +1373,7 @@ private boolean checkForPendingAppHealthActions() {
 
     @Override
     public void handlePullTaskResult(ResultAndError<DataPullTask.PullTaskResult> resultAndError,
-            boolean userTriggeredSync, boolean formsToSend, boolean usingRemoteKeyManagement) {
+                                     boolean userTriggeredSync, boolean formsToSend, boolean usingRemoteKeyManagement) {
         super.handlePullTaskResult(resultAndError, userTriggeredSync, formsToSend,
                 usingRemoteKeyManagement);
         if (UpdateActivity.sBlockedUpdateWorkflowInProgress) {
@@ -1324,7 +1397,7 @@ private void finishWithExecutionIntent() {
     }
 
     private void createAskUseOldDialog(final AndroidSessionWrapper state,
-            final SessionStateDescriptor existing) {
+                                       final SessionStateDescriptor existing) {
         final AndroidCommCarePlatform platform =
                 CommCareApplication.instance().getCommCarePlatform();
         String title = Localization.get("app.workflow.incomplete.continue.title");
@@ -1525,4 +1598,9 @@ private void handleAppUpdate() {
                 break;
         }
     }
+
+    @Override
+    public ReentrantLock getBackgroundSyncLock() {
+        return CommCareSessionService.sessionAliveLock;
+    }
 }
diff --git a/app/src/org/commcare/activities/InstallFromListActivity.java b/app/src/org/commcare/activities/InstallFromListActivity.java
index f776b5259f..10671b9f41 100644
--- a/app/src/org/commcare/activities/InstallFromListActivity.java
+++ b/app/src/org/commcare/activities/InstallFromListActivity.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -12,13 +11,11 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ListView;
-import android.widget.Switch;
 import android.widget.TextView;
-import android.widget.ToggleButton;
+
+import androidx.appcompat.widget.SwitchCompat;
 
 import org.commcare.CommCareApplication;
 import org.commcare.android.database.global.models.AppAvailableToInstall;
@@ -27,7 +24,6 @@
 import org.commcare.core.network.AuthenticationInterceptor;
 import org.commcare.dalvik.R;
 import org.commcare.models.database.SqlStorage;
-import org.commcare.modern.util.Pair;
 import org.commcare.network.CommcareRequestGenerator;
 import org.commcare.preferences.GlobalPrivilegesManager;
 import org.commcare.tasks.ModernHttpTask;
@@ -48,11 +44,8 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 
-import androidx.appcompat.widget.SwitchCompat;
-
 import com.google.common.collect.ImmutableMultimap;
 
 /**
@@ -95,14 +88,14 @@ public class InstallFromListActivity<T> extends CommCareActivity<T> implements H
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setInitialValues(savedInstanceState);
-        setupUI();
+        setupUi();
         if (errorMessage != null) {
             enterErrorState(errorMessage);
         }
         loadPreviouslyRetrievedAvailableApps();
     }
 
-    private void setupUI() {
+    private void setupUi() {
         setContentView(R.layout.user_get_available_apps);
         errorMessageBox = findViewById(R.id.error_message);
         authenticateView = findViewById(R.id.authenticate_view);
@@ -228,10 +221,11 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
     }
 
     /**
+     * Initiates remote request for an updated app list
      * @return whether a request was initiated
      */
     private boolean requestAppList(String username, String password) {
-        String urlToTry = getURLToTry();
+        String urlToTry = getUrlToTry();
         if (urlToTry != null) {
             this.lastUsernameUsed = username;
             this.lastPasswordUsed = password;
@@ -286,7 +280,7 @@ private void setAttemptedRequestFlag() {
         }
     }
 
-    private String getURLToTry() {
+    private String getUrlToTry() {
         if (!requestedFromProd) {
             urlCurrentlyRequestingFrom = PROD_URL;
         } else if (!requestedFromIndia) {
@@ -306,7 +300,7 @@ private void enterErrorState(String message) {
     }
 
     @Override
-    public void processSuccess(int responseCode, InputStream responseData) {
+    public void processSuccess(int responseCode, InputStream responseData, String apiVersion) {
         processResponseIntoAppsList(responseData);
         saveLastSuccessfulCredentials();
         repeatRequestOrShowResultsAfterSuccess();
@@ -317,7 +311,8 @@ private void processResponseIntoAppsList(InputStream responseData) {
             KXmlParser baseParser = ElementParser.instantiateParser(responseData);
             List<AppAvailableToInstall> apps = (new AvailableAppsParser(baseParser)).parse();
             availableApps.addAll(apps);
-        } catch (IOException | InvalidStructureException | XmlPullParserException | UnfullfilledRequirementsException e) {
+        } catch (IOException | InvalidStructureException |
+                 XmlPullParserException |UnfullfilledRequirementsException e) {
             Logger.log(LogTypes.TYPE_RESOURCES, "Error encountered while parsing apps available for install");
         }
     }
@@ -346,7 +341,8 @@ public void processOther(int responseCode) {
     @Override
     public void handleIOException(IOException exception) {
         if (exception instanceof AuthenticationInterceptor.PlainTextPasswordException) {
-            Logger.log(LogTypes.TYPE_ERROR_CONFIG_STRUCTURE, "Encountered PlainTextPasswordException while sending get available apps request: Sending password over HTTP");
+            Logger.log(LogTypes.TYPE_ERROR_CONFIG_STRUCTURE,
+                    "Encountered PlainTextPasswordException while sending get available apps request: Sending password over HTTP");
             new UserfacingErrorHandling<>().createErrorDialog(this, Localization.get("auth.over.http"), true);
         } else if (exception instanceof IOException) {
             Logger.log(LogTypes.TYPE_ERROR_SERVER_COMMS,
@@ -418,7 +414,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
     }
 
     private void sortAppList() {
-        Collections.sort(this.availableApps, (o1, o2) -> o1.getAppName().toLowerCase().compareTo(o2.getAppName().toLowerCase()));
+        Collections.sort(this.availableApps,
+                (o1, o2) -> o1.getAppName().toLowerCase().compareTo(o2.getAppName().toLowerCase()));
     }
 
     @Override
diff --git a/app/src/org/commcare/activities/LoginActivity.java b/app/src/org/commcare/activities/LoginActivity.java
index 2d6ed33b3f..79c07064c3 100644
--- a/app/src/org/commcare/activities/LoginActivity.java
+++ b/app/src/org/commcare/activities/LoginActivity.java
@@ -72,6 +72,7 @@ public class LoginActivity extends CommCareActivity<LoginActivity>
         implements OnItemSelectedListener, DataPullController,
         RuntimePermissionRequester, WithUIController, PullTaskResultReceiver {
 
+    public static final String EXTRA_APP_ID = "extra_app_id";
     private static final String TAG = LoginActivity.class.getSimpleName();
 
     public static final int MENU_DEMO = Menu.FIRST;
@@ -101,6 +102,7 @@ public class LoginActivity extends CommCareActivity<LoginActivity>
 
     private LoginActivityUIController uiController;
     private FormAndDataSyncer formAndDataSyncer;
+    private String presetAppID;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -117,6 +119,8 @@ protected void onCreate(Bundle savedInstanceState) {
         uiController.setupUI();
         formAndDataSyncer = new FormAndDataSyncer();
 
+        presetAppID = getIntent().getStringExtra(EXTRA_APP_ID);
+
         if (savedInstanceState == null) {
             // Only restore last user on the initial creation
             uiController.restoreLastUser();
@@ -550,7 +554,10 @@ protected void populateAppSpinner(ArrayList<ApplicationRecord> readyApps) {
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         // Retrieve the app record corresponding to the app selected
         String appId = appIdDropdownList.get(position);
+        seatAppIfNeeded(appId);
+    }
 
+    protected void seatAppIfNeeded(String appId) {
         boolean selectedNewApp = !appId.equals(CommCareApplication.instance().getCurrentApp().getUniqueId());
         if (selectedNewApp) {
             // Set the id of the last selected app
@@ -740,4 +747,8 @@ private void checkManagedConfiguration() {
             initiateLoginAttempt(false);
         }
     }
+
+    protected String getPresetAppID() {
+        return presetAppID;
+    }
 }
diff --git a/app/src/org/commcare/activities/LoginActivityUIController.java b/app/src/org/commcare/activities/LoginActivityUIController.java
index 6a11fe5526..1c2562d9b0 100644
--- a/app/src/org/commcare/activities/LoginActivityUIController.java
+++ b/app/src/org/commcare/activities/LoginActivityUIController.java
@@ -2,14 +2,10 @@
 
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.StateListDrawable;
-import android.os.Build;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.StateSet;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
@@ -21,6 +17,8 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.preference.PreferenceManager;
+
 import org.commcare.CommCareApplication;
 import org.commcare.CommCareNoficationManager;
 import org.commcare.android.database.app.models.UserKeyRecord;
@@ -43,7 +41,7 @@
 import java.util.ArrayList;
 import java.util.Vector;
 
-import androidx.preference.PreferenceManager;
+import javax.annotation.Nullable;
 
 /**
  * Handles login activity UI
@@ -196,15 +194,15 @@ public void refreshView() {
 
         // Decide whether or not to show the app selection spinner based upon # of usable apps
         ArrayList<ApplicationRecord> readyApps = MultipleAppsUtil.getUsableAppRecords();
-
-        if (readyApps.size() == 1) {
+        ApplicationRecord presetAppRecord = getPresetAppRecord(readyApps);
+        if (readyApps.size() == 1 || presetAppRecord != null) {
             // Set this app as the last selected app, for use in choosing what app to initialize
             // on first startup
-            ApplicationRecord r = readyApps.get(0);
+            ApplicationRecord r = presetAppRecord != null ? presetAppRecord : readyApps.get(0);
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
             prefs.edit().putString(LoginActivity.KEY_LAST_APP, r.getUniqueId()).apply();
-
             setSingleAppUIState();
+            activity.seatAppIfNeeded(r.getUniqueId());
         } else {
             activity.populateAppSpinner(readyApps);
         }
@@ -230,6 +228,23 @@ public void refreshView() {
         }
     }
 
+    @Nullable
+    private ApplicationRecord getPresetAppRecord(ArrayList<ApplicationRecord> readyApps) {
+        String presetAppId = activity.getPresetAppID();
+        if (presetAppId != null) {
+            for (ApplicationRecord readyApp : readyApps) {
+                if (readyApp.getUniqueId().equals(presetAppId)) {
+                    return readyApp;
+                }
+            }
+
+            // if preset App id is supplied but not found show an error
+            String appNotFoundError = activity.getString(R.string.app_with_id_not_found);
+            setErrorMessageUI(appNotFoundError, false);
+        }
+        return null;
+    }
+
     protected void refreshForNewApp() {
         // Remove any error content from trying to log into a different app
         setStyleDefault();
@@ -459,7 +474,7 @@ private void updateBanner() {
         ImageView topBannerImageView =
                 banner.findViewById(R.id.main_top_banner);
         if (!CustomBanner.useCustomBannerFitToActivity(activity, topBannerImageView, CustomBanner.Banner.LOGIN)) {
-            topBannerImageView.setImageResource(R.drawable.commcare_logo);
+            topBannerImageView.setImageResource(R.drawable.commcare_by_dimagi);
         }
     }
 
diff --git a/app/src/org/commcare/activities/MenuActivity.java b/app/src/org/commcare/activities/MenuActivity.java
index 6b17115f3d..442bf5d4cd 100644
--- a/app/src/org/commcare/activities/MenuActivity.java
+++ b/app/src/org/commcare/activities/MenuActivity.java
@@ -58,4 +58,9 @@ protected boolean onBackwardSwipe() {
         }
         return true;
     }
+
+    @Override
+    public boolean shouldListenToSyncComplete() {
+        return true;
+    }
 }
diff --git a/app/src/org/commcare/activities/PostRequestActivity.java b/app/src/org/commcare/activities/PostRequestActivity.java
index 82d32563a3..88c0c20417 100644
--- a/app/src/org/commcare/activities/PostRequestActivity.java
+++ b/app/src/org/commcare/activities/PostRequestActivity.java
@@ -70,7 +70,7 @@ public void onCreateSessionSafe(Bundle savedInstanceState) {
         loadStateFromSavedInstance(savedInstanceState);
         loadStateFromIntent(getIntent());
 
-        setupUI();
+        setupUi();
 
         if (!inErrorState) {
             makePostRequest();
@@ -95,7 +95,7 @@ private void loadStateFromIntent(Intent intent) {
         }
     }
 
-    private void setupUI() {
+    private void setupUi() {
         if (inErrorState) {
             enterErrorState();
         } else {
@@ -115,7 +115,7 @@ private void makePostRequest() {
                 RequestBody requestBody = ModernHttpRequester.getPostBody(params);
                 ModernHttpTask postTask =
                         new ModernHttpTask(this, url.toString(), ImmutableMultimap.of(),
-                                getContentHeadersForXFormPost(requestBody), requestBody,
+                                getContentHeadersForXformPost(requestBody), requestBody,
                                 HTTPMethod.POST, new AuthInfo.CurrentAuth());
                 postTask.connect((CommCareTaskConnector)this);
                 postTask.executeParallel();
@@ -146,7 +146,7 @@ private void retryPost() {
         makePostRequest();
     }
 
-    private HashMap<String, String> getContentHeadersForXFormPost(RequestBody postBody) throws IOException {
+    private HashMap<String, String> getContentHeadersForXformPost(RequestBody postBody) throws IOException {
         HashMap<String, String> headers = new HashMap<>();
         headers.put("Content-Type", "application/x-www-form-urlencoded");
         headers.put("Content-Length", String.valueOf(postBody.contentLength()));
@@ -174,7 +174,7 @@ protected void updateUiAfterDataPullOrSend(String message, boolean success) {
     }
 
     @Override
-    public void processSuccess(int responseCode, InputStream responseData) {
+    public void processSuccess(int responseCode, InputStream responseData, String apiVersion) {
         performSync();
     }
 
@@ -223,7 +223,8 @@ public void onBackPressed() {
 
     @Override
     public CustomProgressDialog generateProgressDialog(int taskId) {
-        String title, message;
+        String title;
+        String message;
         switch (taskId) {
             case DataPullTask.DATA_PULL_TASK_ID:
                 title = Localization.get("sync.communicating.title");
diff --git a/app/src/org/commcare/activities/QueryRequestActivity.java b/app/src/org/commcare/activities/QueryRequestActivity.java
index c82d51958f..cc0b0d423d 100644
--- a/app/src/org/commcare/activities/QueryRequestActivity.java
+++ b/app/src/org/commcare/activities/QueryRequestActivity.java
@@ -150,7 +150,7 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
     }
 
     @Override
-    public void processSuccess(int responseCode, InputStream responseData) {
+    public void processSuccess(int responseCode, InputStream responseData, String apiVersion) {
         // todo pass url and requestData to this callback
         Pair<ExternalDataInstance, String> instanceOrError = remoteQuerySessionManager.buildExternalDataInstance(
                 responseData,
@@ -190,7 +190,8 @@ public void processOther(int responseCode) {
     @Override
     public void handleIOException(IOException exception) {
         if (exception instanceof AuthenticationInterceptor.PlainTextPasswordException) {
-            enterErrorState(Localization.get("auth.request.not.using.https", remoteQuerySessionManager.getBaseUrl().toString()));
+            enterErrorState(Localization.get("auth.request.not.using.https",
+                    remoteQuerySessionManager.getBaseUrl().toString()));
         } else if (exception instanceof IOException) {
             enterErrorState(Localization.get("post.io.error", exception.getMessage()));
         }
@@ -198,7 +199,8 @@ public void handleIOException(IOException exception) {
 
     @Override
     public CustomProgressDialog generateProgressDialog(int taskId) {
-        String title, message;
+        String title;
+        String message;
         switch (taskId) {
             case ModernHttpTask.SIMPLE_HTTP_TASK_ID:
                 title = Localization.get("query.dialog.title");
diff --git a/app/src/org/commcare/activities/QueryRequestUiController.kt b/app/src/org/commcare/activities/QueryRequestUiController.kt
index 097587ca5e..ad606692dc 100644
--- a/app/src/org/commcare/activities/QueryRequestUiController.kt
+++ b/app/src/org/commcare/activities/QueryRequestUiController.kt
@@ -16,13 +16,15 @@ import org.commcare.interfaces.CommCareActivityUIController
 import org.commcare.session.RemoteQuerySessionManager
 import org.commcare.session.RemoteQuerySessionManager.extractMultipleChoices
 import org.commcare.suite.model.QueryPrompt
-import org.commcare.utils.DateRangeUtils
+import org.commcare.util.DateRangeUtils
+import org.commcare.utils.AndroidXUtils
 import org.commcare.views.ManagedUi
 import org.commcare.views.UiElement
 import org.commcare.views.ViewUtil
 import org.commcare.views.widgets.SpinnerWidget
 import org.commcare.views.widgets.WidgetUtils
 import org.javarosa.core.model.SelectChoice
+import org.javarosa.core.services.Logger
 import org.javarosa.core.services.locale.Localizer
 import java.text.ParseException
 import java.util.*
@@ -69,7 +71,7 @@ class QueryRequestUiController(
     }
     fun reloadStateUsingAnswers(answeredPrompts: MutableMap<String, String>) {
         answeredPrompts.forEach { entry ->
-            remoteQuerySessionManager.answerUserPrompt(entry.key, entry.value)
+            answerUserPrompt(entry.key, entry.value)
             val promptView = promptsBoxes[entry.key]
             val queryPrompt = remoteQuerySessionManager.neededUserInputDisplays[entry.key]
             if (queryPrompt!!.isSelect) {
@@ -176,18 +178,27 @@ class QueryRequestUiController(
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable) {
-                remoteQuerySessionManager.answerUserPrompt(queryPrompt.key, s.toString())
+                answerUserPrompt(queryPrompt.key, s.toString())
                 updateAnswerAndRefresh(queryPrompt, s.toString())
             }
         })
         return promptEditText
     }
 
+    private fun answerUserPrompt(key: String, value: String) {
+        // todo mobile don't support blank search yet
+        if ("".equals(value)) {
+            remoteQuerySessionManager.answerUserPrompt(key, null)
+        } else {
+            remoteQuerySessionManager.answerUserPrompt(key, value)
+        }
+    }
+
     private fun updateAnswerAndRefresh(queryPrompt: QueryPrompt, answer: String) {
         val userAnswers = remoteQuerySessionManager.userAnswers
         val oldAnswer = userAnswers[queryPrompt.key]
-        if (oldAnswer == null || !oldAnswer.contentEquals(answer)) {
-            remoteQuerySessionManager.answerUserPrompt(queryPrompt.key, answer)
+        if ((oldAnswer == null && !"".equals(answer)) || (oldAnswer != null && !oldAnswer.contentEquals(answer))) {
+            answerUserPrompt(queryPrompt.key, answer)
             remoteQuerySessionManager.refreshItemSetChoices()
             refreshView()
         }
@@ -339,10 +350,10 @@ class QueryRequestUiController(
         val currentDateRangeText = promptEditText.text.toString()
         if (!TextUtils.isEmpty(currentDateRangeText)) {
             try {
-                dateRangePickerBuilder.setSelection(DateRangeUtils.parseHumanReadableDate(currentDateRangeText))
+                val humanReadableDate = DateRangeUtils.parseHumanReadableDate(currentDateRangeText)
+                dateRangePickerBuilder.setSelection(AndroidXUtils.toPair(humanReadableDate!!.first, humanReadableDate.second))
             } catch (e: ParseException) {
-                // do nothing
-                e.printStackTrace()
+                Logger.exception("Error parsing date range $currentDateRangeText", e)
             }
         }
         val dateRangePicker = dateRangePickerBuilder.build()
@@ -351,10 +362,7 @@ class QueryRequestUiController(
                 selection!!.first
             )
             val endDate = DateRangeUtils.getDateFromTime(selection.second)
-            remoteQuerySessionManager.answerUserPrompt(
-                queryPrompt.key,
-                DateRangeUtils.formatDateRangeAnswer(startDate, endDate)
-            )
+            answerUserPrompt(queryPrompt.key, DateRangeUtils.formatDateRangeAnswer(startDate, endDate))
             promptEditText.setText(DateRangeUtils.getHumanReadableDateRange(startDate, endDate))
         }
         dateRangePicker.show(queryRequestActivity.supportFragmentManager, DATE_PICKER_FRAGMENT_TAG)
diff --git a/app/src/org/commcare/activities/RecoveryActivity.java b/app/src/org/commcare/activities/RecoveryActivity.java
index eccef8ed97..a29918c415 100644
--- a/app/src/org/commcare/activities/RecoveryActivity.java
+++ b/app/src/org/commcare/activities/RecoveryActivity.java
@@ -146,7 +146,10 @@ protected void deliverError(RecoveryActivity receiver, Exception e) {
 
                 };
 
-        mProcess.addSubmissionListener(CommCareApplication.instance().getSession().getListenerForSubmissionNotification());
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            mProcess.addSubmissionListener(
+                    CommCareApplication.instance().getSession().getListenerForSubmissionNotification());
+        }
         mProcess.connect(this);
 
         //Execute on a true multithreaded chain. We should probably replace all of our calls with this
diff --git a/app/src/org/commcare/activities/SyncCapableCommCareActivity.java b/app/src/org/commcare/activities/SyncCapableCommCareActivity.java
index 0202ae5c16..d527bc5904 100644
--- a/app/src/org/commcare/activities/SyncCapableCommCareActivity.java
+++ b/app/src/org/commcare/activities/SyncCapableCommCareActivity.java
@@ -232,23 +232,23 @@ public void handleSyncNotAttempted(String message) {
     public void handleFormUploadResult(FormUploadResult result, String formLabel, boolean userTriggered) {
         switch (result) {
             case FULL_SUCCESS:
-                handleFormSendResult(formLabel, true);
+                updateUiForFormUploadResult(formLabel, true);
                 break;
             case BAD_CERTIFICATE:
                 CommCareApplication.notificationManager().reportNotificationMessage(
                         NotificationMessageFactory.message(NotificationMessageFactory.StockMessages.BadSslCertificate,
                                 NotificationActionButtonInfo.ButtonAction.LAUNCH_DATE_SETTINGS));
 
-                handleFormSendResult(Localization.get(result.getLocaleKeyBase()), false);
+                updateUiForFormUploadResult(Localization.get(result.getLocaleKeyBase()), false);
                 break;
             case ACTIONABLE_FAILURE:
-                handleFormSendResult(result.getErrorMessage(), false);
+                updateUiForFormUploadResult(result.getErrorMessage(), false);
                 break;
             case RATE_LIMITED:
                 showRateLimitError(userTriggered);
                 break;
             case CANCELLED:
-                handleFormSendResult(Localization.get(result.getLocaleKeyBase())
+                updateUiForFormUploadResult(Localization.get(result.getLocaleKeyBase())
                         + " " + formLabel, false);
                 break;
             case AUTH_FAILURE:
@@ -258,12 +258,12 @@ public void handleFormUploadResult(FormUploadResult result, String formLabel, bo
             case INVALID_CASE_GRAPH:
             case FAILURE:
             default:
-                handleFormSendResult(Localization.get(result.getLocaleKeyBase()), false);
+                updateUiForFormUploadResult(Localization.get(result.getLocaleKeyBase()), false);
                 break;
         }
     }
 
-    public void handleFormSendResult(String message, boolean success) {
+    public void updateUiForFormUploadResult(String message, boolean success) {
         updateUiAfterDataPullOrSend(message, success);
         if (success) {
             // Since we know that we just had connectivity, now is a great time to try this
@@ -273,7 +273,7 @@ public void handleFormSendResult(String message, boolean success) {
 
     public void showRateLimitError(boolean userTriggered) {
         if (HiddenPreferences.isRateLimitPopupDisabled() || !userTriggered) {
-            handleFormUploadResult(FormUploadResult.RATE_LIMITED, null, userTriggered);
+            updateUiForFormUploadResult(Localization.get(FormUploadResult.RATE_LIMITED.getLocaleKeyBase()), false);
             return;
         }
         String title = Localization.get("form.send.rate.limit.error.title");
diff --git a/app/src/org/commcare/activities/UpdateActivity.java b/app/src/org/commcare/activities/UpdateActivity.java
index adcc88414d..e855d8afec 100644
--- a/app/src/org/commcare/activities/UpdateActivity.java
+++ b/app/src/org/commcare/activities/UpdateActivity.java
@@ -1,6 +1,7 @@
 package org.commcare.activities;
 
 import androidx.appcompat.app.AppCompatActivity;
+
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -355,7 +356,7 @@ private void reportFailureToNotifications(AppInstallStatus status, String errorM
                 break;
         }
 
-        if(notificationMessage != null) {
+        if (notificationMessage != null) {
             CommCareApplication.notificationManager()
                     .reportNotificationMessage(notificationMessage, true);
             uiController.setNotificationsVisible();
diff --git a/app/src/org/commcare/activities/components/EntitySelectCalloutSetup.java b/app/src/org/commcare/activities/components/EntitySelectCalloutSetup.java
index 53a8c95d18..52dfcd4c37 100644
--- a/app/src/org/commcare/activities/components/EntitySelectCalloutSetup.java
+++ b/app/src/org/commcare/activities/components/EntitySelectCalloutSetup.java
@@ -53,13 +53,13 @@ private static Drawable getCalloutDrawable(Context context, String imagePath) {
             if (b == null) {
                 // Input stream could not be used to derive bitmap, so
                 // showing error-indicating image
-                return context.getResources().getDrawable(R.drawable.ic_menu_archive);
+                return context.getDrawable(R.drawable.ic_menu_archive);
             } else {
                 return new BitmapDrawable(b);
             }
         } else {
             // no image passed in, draw a white background
-            return context.getResources().getDrawable(R.color.white);
+            return context.getDrawable(R.color.white);
         }
     }
 
diff --git a/app/src/org/commcare/activities/components/EntitySelectViewSetup.java b/app/src/org/commcare/activities/components/EntitySelectViewSetup.java
index 3a7f1ed2bd..f163e512d9 100644
--- a/app/src/org/commcare/activities/components/EntitySelectViewSetup.java
+++ b/app/src/org/commcare/activities/components/EntitySelectViewSetup.java
@@ -20,7 +20,7 @@ public static void setupDivider(Context context, ListView view, boolean useNewDi
             }
             dividerWidth += (int)context.getResources().getDimension(R.dimen.row_padding_horizontal);
 
-            LayerDrawable dividerDrawable = (LayerDrawable)context.getResources().getDrawable(R.drawable.divider_case_list_modern);
+            LayerDrawable dividerDrawable = (LayerDrawable)context.getDrawable(R.drawable.divider_case_list_modern);
             dividerDrawable.setLayerInset(0, dividerWidth, 0, 0, 0);
 
             view.setDivider(dividerDrawable);
diff --git a/app/src/org/commcare/activities/components/FormEntryConstants.java b/app/src/org/commcare/activities/components/FormEntryConstants.java
index b6ca94b840..2cf0818a96 100644
--- a/app/src/org/commcare/activities/components/FormEntryConstants.java
+++ b/app/src/org/commcare/activities/components/FormEntryConstants.java
@@ -20,6 +20,7 @@ public class FormEntryConstants {
     public static final int INTENT_COMPOUND_CALLOUT = 13;
     public static final int INTENT_LOCATION_PERMISSION = 14;
     public static final int INTENT_LOCATION_EXCEPTION = 15;
+    public static final int VIEW_VIDEO_FULLSCREEN = 16;
 
     public static final String NAV_STATE_NEXT = "next";
     public static final String NAV_STATE_DONE = "done";
diff --git a/app/src/org/commcare/activities/components/FormNavigationUI.java b/app/src/org/commcare/activities/components/FormNavigationUI.java
index 1fffcbcc64..75cb520e39 100644
--- a/app/src/org/commcare/activities/components/FormNavigationUI.java
+++ b/app/src/org/commcare/activities/components/FormNavigationUI.java
@@ -62,10 +62,10 @@ public static void updateNavigationCues(CommCareActivity activity,
                 findViewById(R.id.nav_btn_finish);
 
         if (!details.relevantBeforeCurrentScreen) {
-            prevButton.setImageResource(R.drawable.icon_close_darkwarm);
+            prevButton.setImageResource(R.drawable.icon_close_white);
             prevButton.setTag(FormEntryConstants.NAV_STATE_QUIT);
         } else {
-            prevButton.setImageResource(R.drawable.icon_chevron_left_brand);
+            prevButton.setImageResource(R.drawable.icon_chevron_left_white);
             prevButton.setTag(FormEntryConstants.NAV_STATE_BACK);
         }
 
@@ -99,7 +99,7 @@ private static void setDoneState(ImageButton nextButton,
             expandAndShowFinishButton(context, finishButton);
         }
 
-        progressBar.setProgressDrawable(context.getResources().getDrawable(R.drawable.progressbar_full));
+        progressBar.setProgressDrawable(context.getDrawable(R.drawable.progressbar_full));
         progressBar.setProgress(details.totalQuestions);
 
         Log.i("Questions", "Form complete");
@@ -148,7 +148,7 @@ private static void setMoreQuestionsState(ImageButton nextButton,
             finishButton.setVisibility(View.GONE);
         }
 
-        progressBar.setProgressDrawable(context.getResources().getDrawable(R.drawable.progressbar_modern));
+        progressBar.setProgressDrawable(context.getDrawable(R.drawable.progressbar_modern));
         progressBar.setProgress(details.completedQuestions);
     }
 
diff --git a/app/src/org/commcare/activities/components/ImageCaptureProcessing.java b/app/src/org/commcare/activities/components/ImageCaptureProcessing.java
index 003c456c91..c36c68b307 100644
--- a/app/src/org/commcare/activities/components/ImageCaptureProcessing.java
+++ b/app/src/org/commcare/activities/components/ImageCaptureProcessing.java
@@ -127,7 +127,7 @@ public static boolean processCaptureResponse(FormEntryActivity activity,
         try {
             return scaleAndSaveImage(originalImage, isImage, instanceFolder, activity);
         } catch (IOException e) {
-            e.printStackTrace();
+            Logger.exception("Error while trying to save captured image", e);
             Toast.makeText(activity, Localization.get("image.capture.not.saved"), Toast.LENGTH_LONG).show();
             return false;
         }
@@ -177,12 +177,9 @@ private static void processImageGivenFileUri(FormEntryActivity activity, String
         } catch (FileExtensionNotFoundException e) {
             Logger.exception("Error while processing chosen image ", e);
             Toast.makeText(activity, Localization.get("image.selection.invalid.extension"), Toast.LENGTH_LONG).show();
-            return;
         } catch (IOException e) {
-            e.printStackTrace();
             Logger.exception("Error while processing chosen image ", e);
             Toast.makeText(activity, Localization.get("image.selection.not.saved"), Toast.LENGTH_LONG).show();
-            return;
         }
     }
 
@@ -198,7 +195,7 @@ private static void processImageGivenFilePath(FormEntryActivity activity, String
             try {
                 scaleAndSaveImage(originalImage, true, instanceFolder, activity);
             } catch (IOException e) {
-                e.printStackTrace();
+                Logger.exception("Error while saving chosen image ", e);
                 Toast.makeText(activity, Localization.get("image.selection.not.saved"), Toast.LENGTH_LONG).show();
             }
         } else {
diff --git a/app/src/org/commcare/activities/components/MenuGrid.java b/app/src/org/commcare/activities/components/MenuGrid.java
index 81e7fe6e6d..b9e51fcdaf 100644
--- a/app/src/org/commcare/activities/components/MenuGrid.java
+++ b/app/src/org/commcare/activities/components/MenuGrid.java
@@ -4,14 +4,11 @@
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.FrameLayout;
 import android.widget.GridView;
 
 import org.commcare.CommCareApplication;
 import org.commcare.adapters.GridMenuAdapter;
 import org.commcare.dalvik.R;
-import org.commcare.google.services.ads.AdLocation;
-import org.commcare.google.services.ads.AdMobManager;
 import org.commcare.suite.model.MenuDisplayable;
 import org.javarosa.core.reference.InvalidReferenceException;
 import org.javarosa.core.reference.ReferenceManager;
@@ -20,7 +17,7 @@
 
 /**
  * Handles the alternative Grid appearance for Module and Form navigation
- * 
+ *
  * @author wspride
  */
 public class MenuGrid extends MenuList implements OnItemLongClickListener {
@@ -38,15 +35,9 @@ protected void initViewAndAdapter(String menuId) {
                 CommCareApplication.instance().getCommCarePlatform(), menuId);
     }
 
-    @Override
-    protected void requestBannerAd() {
-        AdMobManager.requestBannerAdForView(activity,
-                activity.findViewById(R.id.ad_container), AdLocation.MenuGrid);
-    }
-
     @Override
     public boolean onItemLongClick(AdapterView<?> parent, View view,
-            int position, long id) {
+                                   int position, long id) {
         MenuDisplayable value = (MenuDisplayable)parent.getAdapter().getItem(position);
         String audioURI = value.getAudioURI();
         MediaPlayer mp = new MediaPlayer();
@@ -58,7 +49,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view,
                 mp.prepare();
                 mp.start();
             } catch (IOException | IllegalStateException
-                    | InvalidReferenceException e) {
+                     | InvalidReferenceException e) {
                 e.printStackTrace();
             }
         }
diff --git a/app/src/org/commcare/activities/components/MenuList.java b/app/src/org/commcare/activities/components/MenuList.java
index 2e6a666b7f..500e4ac29d 100644
--- a/app/src/org/commcare/activities/components/MenuList.java
+++ b/app/src/org/commcare/activities/components/MenuList.java
@@ -1,23 +1,21 @@
 package org.commcare.activities.components;
 
 import androidx.appcompat.app.AppCompatActivity;
+
 import android.content.Intent;
+
 import androidx.annotation.NonNull;
+
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
-import android.widget.TextView;
 
 import org.commcare.CommCareApplication;
 import org.commcare.activities.CommCareActivity;
 import org.commcare.activities.HomeScreenBaseActivity;
 import org.commcare.adapters.MenuAdapter;
 import org.commcare.dalvik.R;
-import org.commcare.fragments.BreadcrumbBarFragment;
-import org.commcare.google.services.ads.AdLocation;
-import org.commcare.google.services.ads.AdMobManager;
 import org.commcare.session.SessionFrame;
 import org.commcare.suite.model.Entry;
 import org.commcare.suite.model.Menu;
@@ -56,12 +54,6 @@ private void setupMenuInActivity(CommCareActivity activity, String menuId) {
         activity.setContentView(getLayoutFileResource());
         initViewAndAdapter(menuId);
         setupAdapter();
-        requestBannerAd();
-    }
-
-    protected void requestBannerAd() {
-        AdMobManager.requestBannerAdForView(activity,
-                activity.findViewById(R.id.ad_container), AdLocation.MenuList);
     }
 
     protected void initViewAndAdapter(String menuId) {
diff --git a/app/src/org/commcare/adapters/EntityListAdapter.java b/app/src/org/commcare/adapters/EntityListAdapter.java
index 3a7bf770c5..40b76c6da9 100644
--- a/app/src/org/commcare/adapters/EntityListAdapter.java
+++ b/app/src/org/commcare/adapters/EntityListAdapter.java
@@ -1,5 +1,7 @@
 package org.commcare.adapters;
 
+import static org.commcare.cases.util.StringUtils.normalize;
+
 import android.database.DataSetObserver;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,13 +16,13 @@
 import org.commcare.cases.entity.NodeEntityFactory;
 import org.commcare.dalvik.R;
 import org.commcare.interfaces.AndroidSortableEntityAdapter;
+import org.commcare.modern.session.SessionWrapper;
 import org.commcare.preferences.MainConfigurablePreferences;
 import org.commcare.session.SessionInstanceBuilder;
 import org.commcare.suite.model.Action;
 import org.commcare.suite.model.Detail;
 import org.commcare.utils.AndroidUtil;
 import org.commcare.utils.CachingAsyncImageLoader;
-import org.commcare.utils.StringUtils;
 import org.commcare.views.EntityActionViewUtils;
 import org.commcare.views.EntityView;
 import org.commcare.views.EntityViewTile;
@@ -311,7 +313,7 @@ public synchronized void filterByString(String filterRaw) {
         // split by whitespace
         String[] searchTerms = filterRaw.split("\\s+");
         for (int i = 0; i < searchTerms.length; ++i) {
-            searchTerms[i] = StringUtils.normalize(searchTerms[i]);
+            searchTerms[i] = normalize(searchTerms[i]);
         }
         currentSearchTerms = searchTerms;
         searchQuery = filterRaw;
@@ -428,7 +430,10 @@ public void loadCalloutDataFromSession() {
 
     public void saveCalloutDataToSession() {
         if (isFilteringByCalloutResult) {
-            CommCareApplication.instance().getCurrentSession().addExtraToCurrentFrameStep(SessionInstanceBuilder.KEY_ENTITY_LIST_EXTRA_DATA, calloutResponseData);
+            SessionWrapper session = CommCareApplication.instance().getCurrentSession();
+            session.removeExtraFromCurrentFrameStep(SessionInstanceBuilder.KEY_ENTITY_LIST_EXTRA_DATA);
+            session.addExtraToCurrentFrameStep(SessionInstanceBuilder.KEY_ENTITY_LIST_EXTRA_DATA,
+                    calloutResponseData);
         }
     }
 
diff --git a/app/src/org/commcare/adapters/HomeScreenAdapter.java b/app/src/org/commcare/adapters/HomeScreenAdapter.java
index 1add94c1ef..ad37fe0e5a 100755
--- a/app/src/org/commcare/adapters/HomeScreenAdapter.java
+++ b/app/src/org/commcare/adapters/HomeScreenAdapter.java
@@ -108,7 +108,7 @@ private void bindHeader(HeaderViewHolder headerHolder) {
         boolean noCustomBanner =
                 !CustomBanner.useCustomBanner(context, screenHeight, screenWidth, headerHolder.headerImage, CustomBanner.Banner.HOME);
         if (noCustomBanner) {
-            headerHolder.headerImage.setImageResource(R.drawable.commcare_logo);
+            headerHolder.headerImage.setImageResource(R.drawable.commcare_by_dimagi);
         }
     }
 
diff --git a/app/src/org/commcare/adapters/MenuAdapter.java b/app/src/org/commcare/adapters/MenuAdapter.java
index 29c20c1b12..6ae5159bfe 100755
--- a/app/src/org/commcare/adapters/MenuAdapter.java
+++ b/app/src/org/commcare/adapters/MenuAdapter.java
@@ -250,7 +250,13 @@ private void updateBadgeView(View badgeView, String badgeText) {
         if (badgeText != null && !"".equals(badgeText) && !"0".equals(badgeText)) {
             if (badgeText.length() > 3) {
                 // A badge can only fit up to 3 characters
-                badgeText = badgeText.substring(0, 3);
+                try {
+                    Integer.parseInt(badgeText);
+                    badgeText = "999+";
+                } catch (NumberFormatException e) {
+                    // if not a integer then just show an overflow string
+                    badgeText = badgeText.substring(0, 3) + "..";
+                }
             }
             TextView badgeTextView = badgeView.findViewById(R.id.badge_text);
             badgeTextView.setText(badgeText);
diff --git a/app/src/org/commcare/android/database/global/models/ConnectKeyRecord.java b/app/src/org/commcare/android/database/global/models/ConnectKeyRecord.java
new file mode 100644
index 0000000000..010faed81d
--- /dev/null
+++ b/app/src/org/commcare/android/database/global/models/ConnectKeyRecord.java
@@ -0,0 +1,47 @@
+package org.commcare.android.database.global.models;
+
+import org.commcare.android.storage.framework.Persisted;
+import org.commcare.models.framework.Persisting;
+import org.commcare.modern.database.Table;
+import org.commcare.modern.models.MetaField;
+
+import kotlin.Metadata;
+
+/**
+ * DB model for storing the encrypted/encoded Connect DB passphrase
+ *
+ * @author dviggiano
+ */
+@Table(ConnectKeyRecord.STORAGE_KEY)
+public class ConnectKeyRecord extends Persisted {
+    public static final String STORAGE_KEY = "connect_key";
+    public static final String IS_LOCAL = "is_local";
+    @Persisting(1)
+    String encryptedPassphrase;
+
+    @Persisting(2)
+    @MetaField(IS_LOCAL)
+    boolean isLocal;
+
+    public ConnectKeyRecord() {
+    }
+
+    public ConnectKeyRecord(String encryptedPassphrase, boolean isLocal) {
+        this.encryptedPassphrase = encryptedPassphrase;
+        this.isLocal = isLocal;
+    }
+
+    public String getEncryptedPassphrase() {
+        return encryptedPassphrase;
+    }
+    public void setEncryptedPassphrase(String passphrase) {
+        encryptedPassphrase = passphrase;
+    }
+    public boolean getIsLocal() {
+        return isLocal;
+    }
+
+    public static ConnectKeyRecord fromV6(ConnectKeyRecordV6 oldVersion) {
+        return new ConnectKeyRecord(oldVersion.getEncryptedPassphrase(), true);
+    }
+}
diff --git a/app/src/org/commcare/android/database/global/models/ConnectKeyRecordV6.java b/app/src/org/commcare/android/database/global/models/ConnectKeyRecordV6.java
new file mode 100644
index 0000000000..7c96770460
--- /dev/null
+++ b/app/src/org/commcare/android/database/global/models/ConnectKeyRecordV6.java
@@ -0,0 +1,29 @@
+package org.commcare.android.database.global.models;
+
+import org.commcare.android.storage.framework.Persisted;
+import org.commcare.models.framework.Persisting;
+import org.commcare.modern.database.Table;
+
+/**
+ * DB model for storing the encrypted/encoded Connect DB passphrase
+ * Used up to global DB V6
+ *
+ * @author dviggiano
+ */
+@Table(ConnectKeyRecordV6.STORAGE_KEY)
+public class ConnectKeyRecordV6 extends Persisted {
+    public static final String STORAGE_KEY = "connect_key";
+    @Persisting(1)
+    String encryptedPassphrase;
+
+    public ConnectKeyRecordV6() {
+    }
+
+    public ConnectKeyRecordV6(String encryptedPassphrase) {
+        this.encryptedPassphrase = encryptedPassphrase;
+    }
+
+    public String getEncryptedPassphrase() {
+        return encryptedPassphrase;
+    }
+}
diff --git a/app/src/org/commcare/android/database/user/models/FormRecord.java b/app/src/org/commcare/android/database/user/models/FormRecord.java
index 4c0095ace9..5404e616e0 100755
--- a/app/src/org/commcare/android/database/user/models/FormRecord.java
+++ b/app/src/org/commcare/android/database/user/models/FormRecord.java
@@ -430,18 +430,18 @@ private FormRecord updateAndWriteRecord()
                     this, CommCareApplication.instance().getUserStorage(FormRecord.class));
         } catch (InvalidStructureException e1) {
             e1.printStackTrace();
-            throw new InvalidStateException("Invalid data structure found while parsing form. There's something wrong with the application structure, please contact your supervisor.");
+            throw new InvalidStateException("Invalid data structure found while parsing form. There's something wrong with the application structure, please contact your supervisor", e1);
         } catch (XmlPullParserException | IOException e) {
             e.printStackTrace();
-            throw new InvalidStateException("There was a problem with the local storage and the form could not be read.");
+            throw new InvalidStateException("There was a problem with the local storage and the form could not be read.", e);
         } catch (UnfullfilledRequirementsException e) {
             throw new RuntimeException(e);
         }
     }
 
     private static class InvalidStateException extends Exception {
-        public InvalidStateException(String message) {
-            super(message);
+        public InvalidStateException(String message, Throwable e) {
+            super(message, e);
         }
     }
 
diff --git a/app/src/org/commcare/android/javarosa/IntentCallout.java b/app/src/org/commcare/android/javarosa/IntentCallout.java
index 8225217316..94c243f7f7 100644
--- a/app/src/org/commcare/android/javarosa/IntentCallout.java
+++ b/app/src/org/commcare/android/javarosa/IntentCallout.java
@@ -165,7 +165,6 @@ public Intent generate(EvaluationContext ec) {
                 }
             }
         }
-        Logger.log(LogTypes.TYPE_FORM_ENTRY, "Generated intent for callout: " + i.toString());
         return i;
     }
 
diff --git a/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java b/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java
index fcf04c0680..137e0e0b25 100644
--- a/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java
+++ b/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java
@@ -161,8 +161,6 @@ private void publishStatus() {
         if (mAppUpdateState == newState) {
             return;
         }
-        Logger.log(LogTypes.TYPE_CC_UPDATE, "Publishing status update to : " + newState.name() + ", from : "
-                + (mAppUpdateState != null ? mAppUpdateState.name() : "null"));
         mAppUpdateState = newState;
         mCallback.run();
     }
diff --git a/app/src/org/commcare/engine/resource/AndroidResourceManager.java b/app/src/org/commcare/engine/resource/AndroidResourceManager.java
index 55e2b4f179..eb364353f3 100644
--- a/app/src/org/commcare/engine/resource/AndroidResourceManager.java
+++ b/app/src/org/commcare/engine/resource/AndroidResourceManager.java
@@ -190,6 +190,7 @@ public void recordStageUpdateResult(ResultAndError<AppInstallStatus> resultAndEr
      */
     public void processUpdateFailure(AppInstallStatus result) {
         updateStats.registerUpdateFailure(result);
+        Logger.log(LogTypes.TYPE_CC_UPDATE, "Update Attempt failed due to error: " + result);
         FirebaseAnalyticsUtil.reportStageUpdateAttemptFailure(result.toString());
 
         if (result.shouldDiscardPartialUpdateTable()) {
@@ -222,4 +223,4 @@ public void clearUpgrade() {
         HiddenPreferences.setReleasedOnTimeForOngoingAppDownload((AndroidCommCarePlatform)platform, 0);
         HiddenPreferences.setPreUpdateSyncNeeded(PrefValues.NO);
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/org/commcare/engine/resource/ResourceInstallUtils.java b/app/src/org/commcare/engine/resource/ResourceInstallUtils.java
index 75f4f94ffb..603008d9de 100644
--- a/app/src/org/commcare/engine/resource/ResourceInstallUtils.java
+++ b/app/src/org/commcare/engine/resource/ResourceInstallUtils.java
@@ -4,27 +4,32 @@
 
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
+import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.core.network.CaptivePortalRedirectException;
 import org.commcare.engine.resource.installers.SingleAppInstallation;
 import org.commcare.network.RateLimitedException;
-import org.commcare.preferences.ServerUrls;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.preferences.MainConfigurablePreferences;
+import org.commcare.preferences.ServerUrls;
 import org.commcare.resources.ResourceManager;
 import org.commcare.resources.model.Resource;
 import org.commcare.resources.model.ResourceTable;
 import org.commcare.resources.model.UnreliableSourceException;
 import org.commcare.resources.model.UnresolvedResourceException;
 import org.commcare.suite.model.Profile;
+import org.commcare.tasks.ResourceEngineListener;
+import org.commcare.tasks.ResourceEngineTask;
+import org.commcare.tasks.templates.CommCareTaskConnector;
 import org.commcare.util.CommCarePlatform;
 import org.commcare.util.LogTypes;
 import org.commcare.utils.AndroidCommCarePlatform;
 import org.commcare.utils.SessionUnavailableException;
+import org.commcare.views.notifications.NotificationActionButtonInfo;
 import org.javarosa.core.services.Logger;
+import org.javarosa.core.util.PropertyUtils;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.cert.CertificateException;
 import java.util.Date;
 
 import javax.net.ssl.SSLException;
@@ -48,6 +53,98 @@ public static boolean isUpdateReadyToInstall() {
         return ResourceManager.isTableStagedForUpgrade(upgradeTable);
     }
 
+    /**
+     * Creates a new application record in db
+     * @return newly created CommCare App
+     */
+    private static CommCareApp createNewCommCareApp() {
+        ApplicationRecord newRecord =
+                new ApplicationRecord(PropertyUtils.genUUID().replace("-", ""),
+                        ApplicationRecord.STATUS_UNINITIALIZED);
+
+        return new CommCareApp(newRecord);
+    }
+
+    public static CommCareApp startAppInstallAsync(boolean shouldSleep, int taskId, CommCareTaskConnector connector,
+            String installRef) {
+        CommCareApp ccApp = createNewCommCareApp();
+        ResourceEngineTask<ResourceEngineListener> task =
+                new ResourceEngineTask<>(ccApp,
+                        taskId, shouldSleep, false) {
+
+                    @Override
+                    protected void deliverResult(ResourceEngineListener receiver,
+                            AppInstallStatus result) {
+                        handleAppInstallResult(this, receiver, result);
+                    }
+
+                    @Override
+                    protected void deliverUpdate(ResourceEngineListener receiver, int[]... update) {
+                        receiver.updateResourceProgress(update[0][0], update[0][1], update[0][2]);
+                    }
+
+                    @Override
+                    protected void deliverError(ResourceEngineListener receiver, Exception e) {
+                        Logger.exception("Unknown error while app install", e);
+                        receiver.failUnknown(AppInstallStatus.UnknownFailure);
+                    }
+                };
+
+        task.connect(connector);
+        task.executeParallel(installRef);
+        return ccApp;
+    }
+
+    public static void handleAppInstallResult(ResourceEngineTask resourceEngineTask, ResourceEngineListener receiver, AppInstallStatus result) {
+        switch (result) {
+            case Installed:
+                receiver.reportSuccess(true);
+                break;
+            case UpToDate:
+                receiver.reportSuccess(false);
+                break;
+            case MissingResourcesWithMessage:
+                // fall through to more general case:
+            case MissingResources:
+                receiver.failMissingResource(resourceEngineTask.getMissingResourceException(), result);
+                break;
+            case InvalidResource:
+                receiver.failInvalidResource(resourceEngineTask.getInvalidResourceException(), result);
+                break;
+            case InvalidReference:
+                receiver.failInvalidReference(resourceEngineTask.getInvalidReferenceException(), result);
+                break;
+            case IncompatibleReqs:
+                receiver.failBadReqs(resourceEngineTask.getVersionRequired(),
+                        resourceEngineTask.getVersionAvailable(), resourceEngineTask.isMajorIsProblem());
+                break;
+            case NoLocalStorage:
+                receiver.failWithNotification(AppInstallStatus.NoLocalStorage);
+                break;
+            case NoConnection:
+                receiver.failWithNotification(AppInstallStatus.NoConnection);
+                break;
+            case BadSslCertificate:
+                receiver.failWithNotification(AppInstallStatus.BadSslCertificate, NotificationActionButtonInfo.ButtonAction.LAUNCH_DATE_SETTINGS);
+                break;
+            case DuplicateApp:
+                receiver.failWithNotification(AppInstallStatus.DuplicateApp);
+                break;
+            case IncorrectTargetPackage:
+                receiver.failTargetMismatch();
+                break;
+            case ReinstallFromInvalidCcz:
+                receiver.failUnknown(AppInstallStatus.ReinstallFromInvalidCcz);
+                break;
+            case CaptivePortal:
+                receiver.failWithNotification(AppInstallStatus.CaptivePortal);
+                break;
+            default:
+                receiver.failUnknown(AppInstallStatus.UnknownFailure);
+                break;
+        }
+    }
+
     /**
      * @return Version from profile in the app's upgrade table; -1 if upgrade
      * profile not found.
@@ -195,7 +292,6 @@ public static boolean isAutoUpdateInProgress(CommCareApp app) {
     }
 
     public static void logInstallError(Exception e, String logMessage) {
-        e.printStackTrace();
         Logger.exception(logMessage, e);
     }
 
diff --git a/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java b/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java
index 70b6081f1c..9a7c0e9d89 100644
--- a/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java
+++ b/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java
@@ -1,11 +1,7 @@
 package org.commcare.engine.resource.installers;
 
-import org.commcare.CommCareApp;
 import org.commcare.activities.CommCareSetupActivity;
-import org.commcare.engine.resource.AppInstallStatus;
-import org.commcare.tasks.ResourceEngineTask;
-
-import static org.commcare.activities.CommCareSetupActivity.handleAppInstallResult;
+import org.commcare.engine.resource.ResourceInstallUtils;
 
 /**
  * Install CC app from the APK's asset directory
@@ -22,29 +18,6 @@ public class SingleAppInstallation {
      * without prompting the user.
      */
     public static void installSingleApp(CommCareSetupActivity activity, int dialogId) {
-        CommCareApp app = CommCareSetupActivity.getCommCareApp();
-
-        ResourceEngineTask<CommCareSetupActivity> task =
-                new ResourceEngineTask<CommCareSetupActivity>(app, dialogId, false, false) {
-                    @Override
-                    protected void deliverResult(CommCareSetupActivity receiver,
-                                                 AppInstallStatus result) {
-                        handleAppInstallResult(this,receiver,result);
-                    }
-
-                    @Override
-                    protected void deliverUpdate(CommCareSetupActivity receiver,
-                                                 int[]... update) {
-                        receiver.updateResourceProgress(update[0][0], update[0][1], update[0][2]);
-                    }
-
-                    @Override
-                    protected void deliverError(CommCareSetupActivity receiver,
-                                                Exception e) {
-                        receiver.failUnknown(AppInstallStatus.UnknownFailure);
-                    }
-                };
-        task.connect(activity);
-        task.executeParallel(SINGLE_APP_REFERENCE);
+        ResourceInstallUtils.startAppInstallAsync(false, dialogId, activity, SINGLE_APP_REFERENCE);
     }
 }
diff --git a/app/src/org/commcare/gis/DrawingBoundaryActivity.kt b/app/src/org/commcare/gis/DrawingBoundaryActivity.kt
index ffc42831e0..7659fe7511 100644
--- a/app/src/org/commcare/gis/DrawingBoundaryActivity.kt
+++ b/app/src/org/commcare/gis/DrawingBoundaryActivity.kt
@@ -110,10 +110,10 @@ class DrawingBoundaryActivity : BaseMapboxActivity(), LocationListener, MapboxMa
     private fun freezeOrientation() {
         val orientation = resources.configuration.orientation
         requestedOrientation =
-            when (orientation) {
-                Configuration.ORIENTATION_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
-                else -> ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
-            }
+                when (orientation) {
+                    Configuration.ORIENTATION_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
+                    else -> ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
+                }
     }
 
     override fun onMapLoaded() {
@@ -198,9 +198,9 @@ class DrawingBoundaryActivity : BaseMapboxActivity(), LocationListener, MapboxMa
     override fun onLocationChanged(location: Location) {
         if (location != null && location.accuracy <= locationMinAccuracy) {
             val addLocation = previousLocation == null ||
-                    (location.distanceTo(previousLocation) >= location.accuracy + previousLocation!!.accuracy &&
+                    (location.distanceTo(previousLocation!!) >= location.accuracy + previousLocation!!.accuracy &&
                             location.time - previousLocation!!.time >= recordingIntervalMillis &&
-                            location.distanceTo(previousLocation) >= recordingIntervalMeters)
+                            location.distanceTo(previousLocation!!) >= recordingIntervalMeters)
             if (addLocation && isRecording) {
                 previousLocation = location
                 val latLng = LatLng(location.latitude, location.longitude)
@@ -261,21 +261,21 @@ class DrawingBoundaryActivity : BaseMapboxActivity(), LocationListener, MapboxMa
     }
 
     private fun initUI() {
-        viewBinding.startTrackingButton.text =  Localization.get("drawing.boundary.map.start.tracking")
+        viewBinding.startTrackingButton.text = Localization.get("drawing.boundary.map.start.tracking")
         viewBinding.startTrackingButton.setOnClickListener {
             startTracking()
         }
 
-        viewBinding.stopTrackingButton.text =  Localization.get("drawing.boundary.map.stop.tracking")
+        viewBinding.stopTrackingButton.text = Localization.get("drawing.boundary.map.stop.tracking")
         viewBinding.stopTrackingButton.setOnClickListener {
             stoppedUIState()
             stopTracking()
         }
-        viewBinding.okTrackingButton.text =  Localization.get("drawing.boundary.map.ok.tracking")
+        viewBinding.okTrackingButton.text = Localization.get("drawing.boundary.map.ok.tracking")
         viewBinding.okTrackingButton.setOnClickListener {
             finishTracking()
         }
-        viewBinding.redoTrackingButton.text =  Localization.get("drawing.boundary.map.redo.tracking")
+        viewBinding.redoTrackingButton.text = Localization.get("drawing.boundary.map.redo.tracking")
         viewBinding.redoTrackingButton.setOnClickListener {
             trackingUIState()
             redoTracking()
diff --git a/app/src/org/commcare/gis/EntityMapActivity.java b/app/src/org/commcare/gis/EntityMapActivity.java
index c23fe30556..ee3d13c505 100644
--- a/app/src/org/commcare/gis/EntityMapActivity.java
+++ b/app/src/org/commcare/gis/EntityMapActivity.java
@@ -144,4 +144,9 @@ public void onInfoWindowClick(Marker marker) {
         setResult(RESULT_OK, i);
         finish();
     }
+
+    @Override
+    public boolean shouldListenToSyncComplete() {
+        return true;
+    }
 }
diff --git a/app/src/org/commcare/google/services/ads/AdLocation.java b/app/src/org/commcare/google/services/ads/AdLocation.java
deleted file mode 100644
index b4b904852c..0000000000
--- a/app/src/org/commcare/google/services/ads/AdLocation.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.commcare.google.services.ads;
-
-/**
- * Represents all of the unique views in the app that can show an AdMob ad. This is important
- * because AdMob stipulates that there must be a separate AdMob unit ID for each place in your
- * app that an ad is shown.
- *
- * @author Aliza Stone on 2/20/17.
- */
-public enum AdLocation {
-    EntityDetail, EntitySelect, MenuList, MenuGrid
-}
diff --git a/app/src/org/commcare/google/services/ads/AdMobManager.java b/app/src/org/commcare/google/services/ads/AdMobManager.java
deleted file mode 100644
index 0bb9e3d87b..0000000000
--- a/app/src/org/commcare/google/services/ads/AdMobManager.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.commcare.google.services.ads;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.google.android.gms.ads.AdRequest;
-import com.google.android.gms.ads.AdSize;
-import com.google.android.gms.ads.AdView;
-import com.google.android.gms.ads.MobileAds;
-
-import org.commcare.CommCareApplication;
-import org.commcare.dalvik.BuildConfig;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Controls all actions related to showing ads in consumer apps via AdMob
- *
- * @author Aliza Stone
- */
-public class AdMobManager {
-
-    private static final String TEST_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/6300978111";
-
-    public static void requestBannerAdForView(Context context, FrameLayout adContainer,
-                                              AdLocation adLocation) {
-        if (hasValidAdmobId()) {
-            // TODO: It's probably bad not to validate this in any way, but any mechanism for doing
-            // so would defeat the purpose of having made this configurable from the consumer apps resources
-            AdView adView = buildBannerAdView(context, adLocation);
-            adContainer.setVisibility(View.VISIBLE);
-            adContainer.addView(adView);
-
-            AdRequest adRequest = buildAdRequest();
-            adView.loadAd(adRequest);
-        } else {
-            adContainer.setVisibility(View.GONE);
-        }
-    }
-
-    private static AdView buildBannerAdView(Context context, AdLocation adLocation) {
-        AdView adView = new AdView(context);
-        adView.setAdSize(AdSize.BANNER);
-        adView.setAdUnitId(getBannerAdUnitIdForCurrentConsumerApp(adLocation));
-        return adView;
-    }
-
-    public static String getBannerAdUnitIdForCurrentConsumerApp(AdLocation adLocation) {
-        if (BuildConfig.DEBUG) {
-            return TEST_BANNER_AD_UNIT_ID;
-        } else {
-            switch(adLocation) {
-                case EntityDetail:
-                    return BuildConfig.ENTITY_DETAIL_AD_UNIT_ID;
-                case EntitySelect:
-                    return BuildConfig.ENTITY_SELECT_AD_UNIT_ID;
-                case MenuGrid:
-                    return BuildConfig.MENU_GRID_AD_UNIT_ID;
-                case MenuList:
-                    return BuildConfig.MENU_LIST_AD_UNIT_ID;
-                default:
-                    return "";
-            }
-        }
-    }
-
-    private static AdRequest buildAdRequest() {
-        if (BuildConfig.DEBUG) {
-            return buildTestAdRequest();
-        } else {
-            return new AdRequest.Builder().build();
-        }
-    }
-
-    private static AdRequest buildTestAdRequest() {
-        return new AdRequest.Builder()
-                .addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
-                .addTestDevice(CommCareApplication.instance().getPhoneId())
-                .build();
-    }
-
-    public static void initAdsForCurrentConsumerApp(Context context) {
-        if (hasValidAdmobId()) {
-            MobileAds.initialize(context, BuildConfig.ADMOB_ID);
-        }
-    }
-
-    private static boolean hasValidAdmobId() {
-        return CommCareApplication.instance().isConsumerApp() && !"".equals(BuildConfig.ADMOB_ID);
-    }
-}
diff --git a/app/src/org/commcare/graph/view/GraphView.java b/app/src/org/commcare/graph/view/GraphView.java
index 97e75081b5..76c443b24d 100755
--- a/app/src/org/commcare/graph/view/GraphView.java
+++ b/app/src/org/commcare/graph/view/GraphView.java
@@ -83,20 +83,12 @@ public GraphWebView(Context context) {
         protected void onAttachedToWindow() {
             super.onAttachedToWindow();
             FirebaseAnalyticsUtil.reportGraphViewAttached();
-
-            String displayTitle = mTitle == null || "".equals(mTitle) ? "(no title)" : mTitle;
-            Logger.log(LogTypes.TYPE_GRAPHING,
-                    String.format("Start viewing graph in list for %s", displayTitle));
         }
 
         @Override
         protected void onDetachedFromWindow() {
             super.onDetachedFromWindow();
             FirebaseAnalyticsUtil.reportGraphViewDetached();
-
-            String displayTitle = mTitle == null || "".equals(mTitle) ? "(no title)" : mTitle;
-            Logger.log(LogTypes.TYPE_GRAPHING,
-                    String.format("End viewing graph in list for %s", displayTitle));
         }
     }
 
diff --git a/app/src/org/commcare/heartbeat/HeartbeatWorker.kt b/app/src/org/commcare/heartbeat/HeartbeatWorker.kt
index d545cba62a..7b5dfd100c 100644
--- a/app/src/org/commcare/heartbeat/HeartbeatWorker.kt
+++ b/app/src/org/commcare/heartbeat/HeartbeatWorker.kt
@@ -29,13 +29,14 @@ class HeartbeatWorker(context: Context, workerParams: WorkerParameters):
                     Result.retry()
                 }
                 else -> {
-                    Logger.log(LogTypes.TYPE_ERROR_SERVER_COMMS,
-                            "Encountered unexpected exception during heartbeat communications: "
-                                    + e.message + ". Stopping the heartbeat thread.")
+                    Logger.exception(
+                        "Encountered unexpected exception during heartbeat communications, stopping the heartbeat thread.",
+                        e
+                    )
                     Result.failure()
                 }
             }
         }
         return Result.success()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/org/commcare/interfaces/AndroidSortableEntityAdapter.java b/app/src/org/commcare/interfaces/AndroidSortableEntityAdapter.java
index 25d82b6f58..91873891af 100644
--- a/app/src/org/commcare/interfaces/AndroidSortableEntityAdapter.java
+++ b/app/src/org/commcare/interfaces/AndroidSortableEntityAdapter.java
@@ -1,10 +1,10 @@
 package org.commcare.interfaces;
 
 import org.commcare.CommCareApplication;
+import org.commcare.cases.entity.AsyncNodeEntityFactory;
 import org.commcare.cases.entity.Entity;
 import org.commcare.cases.entity.NodeEntityFactory;
 import org.commcare.cases.entity.SortableEntityAdapter;
-import org.commcare.models.AsyncNodeEntityFactory;
 import org.commcare.suite.model.Detail;
 import org.commcare.views.notifications.NotificationMessageFactory;
 import org.javarosa.core.model.instance.TreeReference;
diff --git a/app/src/org/commcare/interfaces/CommcareRequestEndpoints.java b/app/src/org/commcare/interfaces/CommcareRequestEndpoints.java
index 08492bd29d..45b4bdd0b2 100644
--- a/app/src/org/commcare/interfaces/CommcareRequestEndpoints.java
+++ b/app/src/org/commcare/interfaces/CommcareRequestEndpoints.java
@@ -20,7 +20,7 @@
  * @author Phillip Mates (pmates@dimagi.com)
  */
 public interface CommcareRequestEndpoints {
-    Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean includeStateFlags) throws IOException;
+    Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean includeStateFlags, boolean skipFixtures) throws IOException;
 
     Response<ResponseBody> makeKeyFetchRequest(String baseUri, @Nullable Date lastRequest) throws IOException;
 
diff --git a/app/src/org/commcare/interfaces/FormSaveCallback.java b/app/src/org/commcare/interfaces/FormSaveCallback.java
index f404af1692..9029fb7d23 100644
--- a/app/src/org/commcare/interfaces/FormSaveCallback.java
+++ b/app/src/org/commcare/interfaces/FormSaveCallback.java
@@ -8,5 +8,5 @@ public interface FormSaveCallback {
      * Starts a task to save the current form being edited. Will be expected to call the provided
      * listener when saving is complete and the current session state is no longer volatile
      */
-    void formSaveCallback(Runnable callback);
+    void formSaveCallback(boolean sessionExpired, boolean userTriggered, Runnable callback);
 }
diff --git a/app/src/org/commcare/interfaces/FormSavedListener.java b/app/src/org/commcare/interfaces/FormSavedListener.java
index d5ee318387..6179e100ee 100644
--- a/app/src/org/commcare/interfaces/FormSavedListener.java
+++ b/app/src/org/commcare/interfaces/FormSavedListener.java
@@ -10,5 +10,5 @@ public interface FormSavedListener {
     /**
      * Callback to be run after a form has been saved.
      */
-    void savingComplete(SaveToDiskTask.SaveStatus formSaveStatus, String errorMessage);
+    void savingComplete(SaveToDiskTask.SaveStatus formSaveStatus, String errorMessage, boolean exit, boolean userTriggered);
 }
diff --git a/app/src/org/commcare/location/CommCareProviderLocationController.kt b/app/src/org/commcare/location/CommCareProviderLocationController.kt
index 923abe8bbe..e7ee17c2eb 100644
--- a/app/src/org/commcare/location/CommCareProviderLocationController.kt
+++ b/app/src/org/commcare/location/CommCareProviderLocationController.kt
@@ -7,7 +7,9 @@ import android.content.IntentFilter
 import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
+import android.os.Build
 import android.os.Bundle
+import androidx.annotation.RequiresApi
 import org.commcare.utils.GeoUtils
 
 /**
@@ -47,7 +49,12 @@ class CommCareProviderLocationController(private var mContext: Context?,
             mListener?.missingPermissions()
             return
         }
-        mContext?.registerReceiver(mReceiver, IntentFilter(LocationManager.PROVIDERS_CHANGED_ACTION))
+        val intentFilter = IntentFilter(LocationManager.PROVIDERS_CHANGED_ACTION);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            mContext?.registerReceiver(mReceiver, intentFilter, Context.RECEIVER_EXPORTED)
+        } else {
+            mContext?.registerReceiver(mReceiver, intentFilter)
+        }
         checkProviderAndRequestLocation()
     }
 
diff --git a/app/src/org/commcare/logging/AndroidLogger.java b/app/src/org/commcare/logging/AndroidLogger.java
index 338648d52c..2b1d4ede21 100755
--- a/app/src/org/commcare/logging/AndroidLogger.java
+++ b/app/src/org/commcare/logging/AndroidLogger.java
@@ -82,4 +82,9 @@ public int logSize() {
     public void halt() {
         //Meh.
     }
+
+    @Override
+    public void logException(Throwable e) {
+        CrashUtil.reportException(e);
+    }
 }
diff --git a/app/src/org/commcare/logging/PreInitLogger.java b/app/src/org/commcare/logging/PreInitLogger.java
index 40e485a525..2670f06354 100755
--- a/app/src/org/commcare/logging/PreInitLogger.java
+++ b/app/src/org/commcare/logging/PreInitLogger.java
@@ -1,6 +1,7 @@
 package org.commcare.logging;
 
 import org.commcare.android.javarosa.AndroidLogEntry;
+import org.commcare.utils.CrashUtil;
 import org.javarosa.core.api.ILogger;
 import org.javarosa.core.log.IFullLogSerializer;
 import org.javarosa.core.log.StreamLogSerializer;
@@ -72,4 +73,9 @@ public int logSize() {
     public void halt() {
         // TODO Auto-generated method stub
     }
+
+    @Override
+    public void logException(Throwable e) {
+        CrashUtil.reportException(e);
+    }
 }
diff --git a/app/src/org/commcare/logic/AndroidFormController.java b/app/src/org/commcare/logic/AndroidFormController.java
index 79892da3f0..65e6741a09 100644
--- a/app/src/org/commcare/logic/AndroidFormController.java
+++ b/app/src/org/commcare/logic/AndroidFormController.java
@@ -1,18 +1,17 @@
 package org.commcare.logic;
 
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.commcare.google.services.analytics.FormAnalyticsHelper;
-import org.commcare.utils.FileUtil;
+import org.commcare.models.database.InterruptedFormState;
 import org.commcare.views.widgets.WidgetFactory;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.FormIndex;
 import org.javarosa.form.api.FormController;
 import org.javarosa.form.api.FormEntryController;
 
-import java.io.File;
-import java.util.Date;
-
 /**
  * Wrapper around FormController to handle Android-specific form entry actions
  */
@@ -23,12 +22,18 @@ public class AndroidFormController extends FormController implements PendingCall
     private boolean wasPendingCalloutCancelled;
     private FormIndex formIndexToReturnTo = null;
     private boolean formCompleteAndSaved = false;
+    @Nullable
+    private InterruptedFormState interruptedFormState;
 
     private FormAnalyticsHelper formAnalyticsHelper;
 
-    public AndroidFormController(FormEntryController fec, boolean readOnly) {
+    public AndroidFormController(FormEntryController fec, boolean readOnly, @Nullable InterruptedFormState interruptedFormState) {
         super(fec, readOnly);
         formAnalyticsHelper = new FormAnalyticsHelper();
+        this.interruptedFormState = interruptedFormState;
+        if (interruptedFormState !=null) {
+            formIndexToReturnTo = interruptedFormState.getFormIndex();
+        }
     }
 
     @Override
@@ -88,4 +93,8 @@ public FormAnalyticsHelper getFormAnalyticsHelper() {
     public FormDef getFormDef() {
         return mFormEntryController.getModel().getForm();
     }
+
+    public InterruptedFormState getInterruptedFormState(){
+        return interruptedFormState;
+    }
 }
diff --git a/app/src/org/commcare/logic/ArchivedFormRemoteRestore.java b/app/src/org/commcare/logic/ArchivedFormRemoteRestore.java
index 0a77f6c547..722bdee547 100644
--- a/app/src/org/commcare/logic/ArchivedFormRemoteRestore.java
+++ b/app/src/org/commcare/logic/ArchivedFormRemoteRestore.java
@@ -2,7 +2,6 @@
 
 import android.widget.Toast;
 
-import org.apache.commons.io.FilenameUtils;
 import org.commcare.CommCareApplication;
 import org.commcare.activities.FormRecordListActivity;
 import org.commcare.network.DataPullRequester;
@@ -55,8 +54,9 @@ private static void requestForms(FormRecordListActivity activity, CommCarePlatfo
         User u = CommCareApplication.instance().getSession().getLoggedInUser();
 
         // We should go digest auth this user on the server and see whether to pull them down.
-        DataPullTask<FormRecordListActivity> pull = new DataPullTask<FormRecordListActivity>(u.getUsername(),
-                u.getCachedPwd(), u.getUniqueId(), remoteUrl, activity, dataPullRequester, blockRemoteKeyManagement) {
+        DataPullTask<FormRecordListActivity> pull = new DataPullTask<FormRecordListActivity>(
+                u.getUsername(), u.getCachedPwd(), u.getUniqueId(), remoteUrl, activity,
+                dataPullRequester, blockRemoteKeyManagement, false) {
             @Override
             protected void deliverResult(FormRecordListActivity receiver, ResultAndError<PullTaskResult> statusAndErrorMessage) {
                 PullTaskResult status = statusAndErrorMessage.data;
diff --git a/app/src/org/commcare/logic/FormHierarchyBuilder.java b/app/src/org/commcare/logic/FormHierarchyBuilder.java
index 785095b955..03ff169a6c 100644
--- a/app/src/org/commcare/logic/FormHierarchyBuilder.java
+++ b/app/src/org/commcare/logic/FormHierarchyBuilder.java
@@ -138,7 +138,7 @@ private void addQuestionEntry() {
             isError = true;
         }
         formList.add(new HierarchyElement(context, questionText, fp.getAnswerText(),
-                fepIcon == -1 ? null : context.getResources().getDrawable(fepIcon),
+                fepIcon == -1 ? null : context.getDrawable(fepIcon),
                 isError, HierarchyEntryType.question, fp.getIndex()));
     }
 
@@ -147,7 +147,7 @@ private void addNewRepeatHeading() {
 
         int fepIcon = R.drawable.avatar_vellum_repeat_group;
         formList.add(new HierarchyElement(context, fc.getLongText(), null,
-                context.getResources().getDrawable(fepIcon),
+                context.getDrawable(fepIcon),
                 false, HierarchyEntryType.question, fc.getIndex()));
     }
 
@@ -157,7 +157,7 @@ private void addRepeatHeading() {
             // Only add the heading if it is the repeat group entry, not an element in the group.
             HierarchyElement group =
                     new HierarchyElement(context, fc.getLongText(), null,
-                            context.getResources().getDrawable(R.drawable.expander_ic_minimized),
+                            context.getDrawable(R.drawable.expander_ic_minimized),
                             false,
                             HierarchyEntryType.collapsed, fc.getIndex());
             formList.add(group);
diff --git a/app/src/org/commcare/mediadownload/MissingMediaDownloadHelper.kt b/app/src/org/commcare/mediadownload/MissingMediaDownloadHelper.kt
index 7fb5f8c224..dacf57fdae 100644
--- a/app/src/org/commcare/mediadownload/MissingMediaDownloadHelper.kt
+++ b/app/src/org/commcare/mediadownload/MissingMediaDownloadHelper.kt
@@ -34,7 +34,7 @@ object MissingMediaDownloadHelper : TableStateListener {
     private var resourceInProgress: Resource? = null
 
     private val jobs = ArrayList<Job>()
-    private lateinit var mPinnedNotificationProgress: PinnedNotificationWithProgress
+    private lateinit var mPinnedNotificationProgress: PinnedNotificationWithProgress<AppInstallStatus>
 
     // constants
     private const val BACK_OFF_DELAY = 5 * 60 * 1000L // 5 mins
@@ -83,6 +83,7 @@ object MissingMediaDownloadHelper : TableStateListener {
 
             RequestStats.register(InstallRequestSource.BACKGROUND_LAZY_RESOURCE)
             global.setInstallCancellationChecker(cancellationChecker)
+
             startPinnedNotification()
 
             val lazyResourceIds = global.lazyResourceIds
@@ -123,18 +124,22 @@ object MissingMediaDownloadHelper : TableStateListener {
                 appInstallStatus = AppInstallStatus.InvalidResource
                 NotificationMessageFactory.message(appInstallStatus, arrayOf(null, it.resourceName, it.message))
             }
+
             is LocalStorageUnavailableException -> {
                 appInstallStatus = AppInstallStatus.NoLocalStorage
                 NotificationMessageFactory.message(appInstallStatus, arrayOf(null, null, it.message))
             }
+
             is UnresolvedResourceException -> {
                 appInstallStatus = ResourceInstallUtils.processUnresolvedResource(it)
                 NotificationMessageFactory.message(appInstallStatus, arrayOf(null, it.resource.descriptor, it.message))
             }
+
             is InstallCancelledException -> {
                 appInstallStatus = AppInstallStatus.Cancelled
                 NotificationMessageFactory.message(appInstallStatus, arrayOf(null, null, it.message))
             }
+
             else -> {
                 appInstallStatus = AppInstallStatus.UnknownFailure
                 NotificationMessageFactory.message(appInstallStatus, arrayOf(null, null, it.message))
@@ -189,7 +194,7 @@ object MissingMediaDownloadHelper : TableStateListener {
                 .filter { it != null }
                 .filter { AndroidResourceUtils.matchFileUriToResource(it, uri) }
                 .take(1)
-                .map { runBlocking { downloadResource(it) }}
+                .map { runBlocking { downloadResource(it) } }
                 .firstOrNull()
 
         if (result == null) {
@@ -270,15 +275,21 @@ object MissingMediaDownloadHelper : TableStateListener {
     }
 
     private fun startPinnedNotification() {
-        mPinnedNotificationProgress = PinnedNotificationWithProgress(CommCareApplication.instance(), "media.pinned.download",
-                "media.pinned.progress", R.drawable.update_download_icon)
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            mPinnedNotificationProgress = PinnedNotificationWithProgress(CommCareApplication.instance(), "media.pinned.download",
+                    "media.pinned.progress", R.drawable.update_download_icon)
+        }
     }
 
     private fun updateNotification(complete: Int, total: Int) {
-        mPinnedNotificationProgress.handleTaskUpdate(complete, total)
+        if (this::mPinnedNotificationProgress.isInitialized) {
+            mPinnedNotificationProgress.handleTaskUpdate(complete, total)
+        }
     }
 
     private fun cancelNotification() {
-        mPinnedNotificationProgress.handleTaskCancellation()
+        if (this::mPinnedNotificationProgress.isInitialized) {
+            mPinnedNotificationProgress.handleTaskCancellation()
+        }
     }
 }
diff --git a/app/src/org/commcare/models/AndroidSessionWrapper.java b/app/src/org/commcare/models/AndroidSessionWrapper.java
index f51b1dc48a..9419371875 100755
--- a/app/src/org/commcare/models/AndroidSessionWrapper.java
+++ b/app/src/org/commcare/models/AndroidSessionWrapper.java
@@ -5,11 +5,12 @@
 import org.commcare.CommCareApplication;
 import org.commcare.android.database.user.models.FormRecord;
 import org.commcare.android.database.user.models.SessionStateDescriptor;
-import org.commcare.core.interfaces.RemoteInstanceFetcher;
 import org.commcare.models.database.AndroidSandbox;
+import org.commcare.models.database.InterruptedFormState;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.modern.session.SessionWrapper;
 import org.commcare.modern.session.SessionWrapperInterface;
+import org.commcare.modern.util.Pair;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.session.CommCareSession;
 import org.commcare.session.SessionDescriptorUtil;
@@ -20,12 +21,12 @@
 import org.commcare.suite.model.Entry;
 import org.commcare.suite.model.FormEntry;
 import org.commcare.suite.model.SessionDatum;
-import org.commcare.suite.model.StackFrameStep;
 import org.commcare.suite.model.StackOperation;
 import org.commcare.util.CommCarePlatform;
 import org.commcare.utils.AndroidInstanceInitializer;
 import org.commcare.utils.CommCareUtil;
 import org.commcare.utils.CrashUtil;
+import org.javarosa.core.model.FormIndex;
 import org.javarosa.core.model.condition.EvaluationContext;
 import org.javarosa.xpath.analysis.InstanceNameAccumulatingAnalyzer;
 import org.javarosa.xpath.analysis.XPathAnalyzable;
@@ -81,7 +82,8 @@ public void reset() {
      * Includes any cached info (since the casedb might have changed) and the individual id's
      * and such.
      */
-    private void cleanVolatiles() {
+
+    public void cleanVolatiles() {
         setFormRecordId(-1);
         sessionStateRecordId = -1;
         //CTS - Added to fix bugs where casedb didn't get renewed between sessions (possibly
@@ -183,12 +185,16 @@ private static boolean ssdHasValidFormRecordId(int ssdId,
                 formRecordStorage.getMetaDataFieldForRecord(correspondingFormRecordId, FormRecord.META_STATUS));
     }
 
-    public void setCurrentStateAsInterrupted() {
+    public void setCurrentStateAsInterrupted(FormIndex formIndex, boolean sessionExpired) {
         if (sessionStateRecordId != -1) {
             SqlStorage<SessionStateDescriptor> sessionStorage =
                     CommCareApplication.instance().getUserStorage(SessionStateDescriptor.class);
             SessionStateDescriptor current = sessionStorage.read(sessionStateRecordId);
+
+            InterruptedFormState interruptedFormState =
+                    new InterruptedFormState(current.getID(), formIndex, current.getFormRecordId(), sessionExpired);
             HiddenPreferences.setInterruptedSSD(current.getID());
+            HiddenPreferences.setInterruptedFormState(interruptedFormState);
         }
     }
 
diff --git a/app/src/org/commcare/models/AsyncEntity.java b/app/src/org/commcare/models/AsyncEntity.java
deleted file mode 100755
index 7a8b850ffd..0000000000
--- a/app/src/org/commcare/models/AsyncEntity.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package org.commcare.models;
-
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.commcare.CommCareApplication;
-import org.commcare.cases.entity.Entity;
-import org.commcare.logging.XPathErrorLogger;
-import org.commcare.models.database.user.models.EntityStorageCache;
-import org.commcare.suite.model.DetailField;
-import org.commcare.suite.model.Text;
-import org.commcare.utils.SessionUnavailableException;
-import org.commcare.utils.StringUtils;
-import org.javarosa.core.model.condition.EvaluationContext;
-import org.javarosa.core.model.instance.TreeReference;
-import org.javarosa.xpath.XPathException;
-import org.javarosa.xpath.expr.FunctionUtils;
-import org.javarosa.xpath.expr.XPathExpression;
-import org.javarosa.xpath.parser.XPathSyntaxException;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * An AsyncEntity is an entity reference which is capable of building its
- * values (evaluating all Text elements/background data elements) lazily
- * rather than upfront when the entity is constructed.
- *
- * It is threadsafe.
- *
- * It will attempt to Cache its values persistently by a derived entity key rather
- * than evaluating them each time when possible. This can be slow to perform across
- * all entities internally due to the overhead of establishing the db connection, it
- * is recommended that the entities be primed externally with a bulk query.
- *
- * @author ctsims
- */
-public class AsyncEntity extends Entity<TreeReference> {
-
-    private final DetailField[] fields;
-    private final Object[] data;
-    private final String[] sortData;
-    private final boolean[] relevancyData;
-    private final String[][] sortDataPieces;
-    private final EvaluationContext context;
-    private final Hashtable<String, XPathExpression> mVariableDeclarations;
-    private boolean mVariableContextLoaded = false;
-    private final String mCacheIndex;
-    private final String mDetailId;
-
-    private final EntityStorageCache mEntityStorageCache;
-
-    /*
-     * the Object's lock. NOTE: _DO NOT LOCK ANY CODE WHICH READS/WRITES THE CACHE
-     * UNTIL YOU HAVE A LOCK FOR THE DB!
-     * 
-     * The lock is for the integrity of this object, not the larger environment, 
-     * and any DB access has its own implict lock between threads, so it's easy
-     * to accidentally deadlock if you don't already have the db lock
-     * 
-     * Basically you should never be calling mEntityStorageCache from inside of
-     * a lock that 
-     */
-    private final Object mAsyncLock = new Object();
-
-    public AsyncEntity(DetailField[] fields, EvaluationContext ec,
-                       TreeReference t, Hashtable<String, XPathExpression> variables,
-                       EntityStorageCache cache, String cacheIndex, String detailId,
-                       String extraKey) {
-        super(t, extraKey);
-
-        this.fields = fields;
-        this.data = new Object[fields.length];
-        this.sortData = new String[fields.length];
-        this.sortDataPieces = new String[fields.length][];
-        this.relevancyData = new boolean[fields.length];
-        this.context = ec;
-        this.mVariableDeclarations = variables;
-        this.mEntityStorageCache = cache;
-
-        //TODO: It's weird that we pass this in, kind of, but the thing is that we don't want to figure out
-        //if this ref is _cachable_ every time, since it's a pretty big lift
-        this.mCacheIndex = cacheIndex;
-
-        this.mDetailId = detailId;
-    }
-
-    private void loadVariableContext() {
-        synchronized (mAsyncLock) {
-            if (!mVariableContextLoaded) {
-                //These are actually in an ordered hashtable, so we can't just get the keyset, since it's
-                //in a 1.3 hashtable equivalent
-                for (Enumeration<String> en = mVariableDeclarations.keys(); en.hasMoreElements(); ) {
-                    String key = en.nextElement();
-                    context.setVariable(key, FunctionUtils.unpack(mVariableDeclarations.get(key).eval(context)));
-                }
-                mVariableContextLoaded = true;
-            }
-        }
-    }
-
-    @Override
-    public Object getField(int i) {
-        synchronized (mAsyncLock) {
-            loadVariableContext();
-            if (data[i] == null) {
-                try {
-                    data[i] = fields[i].getTemplate().evaluate(context);
-                } catch (XPathException xpe) {
-                    XPathErrorLogger.INSTANCE.logErrorToCurrentApp(xpe);
-                    xpe.printStackTrace();
-                    data[i] = "<invalid xpath: " + xpe.getMessage() + ">";
-                }
-            }
-            return data[i];
-        }
-    }
-
-    @Override
-    public String getNormalizedField(int i) {
-        String normalized = this.getSortField(i);
-        if (normalized == null) {
-            return "";
-        }
-        return normalized;
-    }
-
-    @Override
-    public String getSortField(int i) {
-        //Get a db handle so we can get an outer lock
-        SQLiteDatabase db;
-        try {
-            db = CommCareApplication.instance().getUserDbHandle();
-        } catch (SessionUnavailableException e) {
-            return null;
-        }
-
-        //get the db lock
-        db.beginTransaction();
-        try {
-            //get our second lock.
-            synchronized (mAsyncLock) {
-                if (sortData[i] == null) {
-                    // sort data not in search field cache; load and store it
-                    Text sortText = fields[i].getSort();
-                    if (sortText == null) {
-                        db.setTransactionSuccessful();
-                        return null;
-                    }
-
-                    String cacheKey = AsyncNodeEntityFactory.getCacheKey(mDetailId, String.valueOf(i));
-
-                    if (mCacheIndex != null) {
-                        //Check the cache!
-                        String value = mEntityStorageCache.retrieveCacheValue(mCacheIndex, cacheKey);
-                        if (value != null) {
-                            this.setSortData(i, value);
-                            db.setTransactionSuccessful();
-                            return sortData[i];
-                        }
-                    }
-
-                    loadVariableContext();
-                    try {
-                        sortText = fields[i].getSort();
-                        if (sortText == null) {
-                            this.setSortData(i, getFieldString(i));
-                        } else {
-                            this.setSortData(i, StringUtils.normalize(sortText.evaluate(context)));
-                        }
-
-                        mEntityStorageCache.cache(mCacheIndex, cacheKey, sortData[i]);
-                    } catch (XPathException xpe) {
-                        XPathErrorLogger.INSTANCE.logErrorToCurrentApp(xpe);
-                        xpe.printStackTrace();
-                        sortData[i] = "<invalid xpath: " + xpe.getMessage() + ">";
-                    }
-                }
-                db.setTransactionSuccessful();
-                return sortData[i];
-            }
-
-        } finally {
-            //free the db lock.
-            db.endTransaction();
-        }
-    }
-
-    @Override
-    public int getNumFields() {
-        return fields.length;
-    }
-
-    @Override
-    public boolean isValidField(int fieldIndex) {
-        //NOTE: This totally jacks the asynchronicity. It's only used in
-        //detail fields for now, so not super important, but worth bearing
-        //in mind
-        synchronized (mAsyncLock) {
-            loadVariableContext();
-            if (getField(fieldIndex).equals("")) {
-                return false;
-            }
-
-            try {
-                this.relevancyData[fieldIndex] = this.fields[fieldIndex].isRelevant(this.context);
-            } catch (XPathSyntaxException e) {
-                final String msg = "Invalid relevant condition for field : " + fields[fieldIndex].getHeader().toString();
-                XPathErrorLogger.INSTANCE.logErrorToCurrentApp(msg);
-                throw new RuntimeException(msg);
-            }
-            return this.relevancyData[fieldIndex];
-        }
-    }
-
-    @Override
-    public Object[] getData() {
-        for (int i = 0; i < this.getNumFields(); ++i) {
-            this.getField(i);
-        }
-        return data;
-    }
-
-    @Override
-    public String[] getSortFieldPieces(int i) {
-        if (getSortField(i) == null) {
-            return new String[0];
-        }
-        return sortDataPieces[i];
-    }
-
-    private void setSortData(int i, String val) {
-        synchronized (mAsyncLock) {
-            this.sortData[i] = val;
-            this.sortDataPieces[i] = breakUpField(val);
-        }
-    }
-
-    public void setSortData(String cacheKey, String val) {
-        int sortIndex = EntityStorageCache.getSortFieldIdFromCacheKey(mDetailId, cacheKey);
-        if (sortIndex != -1) {
-            setSortData(sortIndex, val);
-        }
-    }
-
-    private static String[] breakUpField(String input) {
-        if (input == null) {
-            return new String[0];
-        } else {
-            //We always fuzzy match on the sort field and only if it is available
-            //(as a way to restrict possible matching)
-            return input.split("\\s+");
-        }
-    }
-}
diff --git a/app/src/org/commcare/models/AsyncNodeEntityFactory.java b/app/src/org/commcare/models/AsyncNodeEntityFactory.java
deleted file mode 100755
index f9c8cc320c..0000000000
--- a/app/src/org/commcare/models/AsyncNodeEntityFactory.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.commcare.models;
-
-import android.util.Log;
-
-import net.sqlcipher.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.commcare.AppUtils;
-import org.commcare.CommCareApplication;
-import org.commcare.android.logging.ReportingUtils;
-import org.commcare.cases.entity.Entity;
-import org.commcare.cases.entity.NodeEntityFactory;
-import org.commcare.models.database.DbUtil;
-import org.commcare.models.database.SqlStorage;
-import org.commcare.models.database.user.models.EntityStorageCache;
-import org.commcare.modern.database.TableBuilder;
-import org.commcare.suite.model.Detail;
-import org.commcare.suite.model.DetailField;
-import org.javarosa.core.model.condition.EvaluationContext;
-import org.javarosa.core.model.instance.TreeReference;
-import org.javarosa.core.model.utils.CacheHost;
-import org.javarosa.core.util.OrderedHashtable;
-import org.javarosa.xpath.expr.XPathExpression;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * @author ctsims
- */
-public class AsyncNodeEntityFactory extends NodeEntityFactory {
-    private static final String TAG = AsyncNodeEntityFactory.class.getSimpleName();
-    private final OrderedHashtable<String, XPathExpression> mVariableDeclarations;
-
-    private final Hashtable<String, AsyncEntity> mEntitySet = new Hashtable<>();
-    private final EntityStorageCache mEntityCache;
-
-    private CacheHost mCacheHost = null;
-    private Boolean mTemplateIsCachable = null;
-    private static final Object mAsyncLock = new Object();
-    private Thread mAsyncPrimingThread;
-
-    // Don't show entity list until we primeCache and caches all fields
-    private final boolean isBlockingAsyncMode;
-
-    public AsyncNodeEntityFactory(Detail d, EvaluationContext ec) {
-        super(d, ec);
-
-        mVariableDeclarations = detail.getVariableDeclarations();
-        mEntityCache = new EntityStorageCache("case");
-        isBlockingAsyncMode = detail.hasSortField();
-    }
-
-    @Override
-    public Entity<TreeReference> getEntity(TreeReference data) {
-        EvaluationContext nodeContext = new EvaluationContext(ec, data);
-
-        mCacheHost = nodeContext.getCacheHost(data);
-
-        String mCacheIndex = null;
-        if (mTemplateIsCachable == null) {
-            mTemplateIsCachable = mCacheHost != null && mCacheHost.isReferencePatternCachable(data);
-        }
-        if (mTemplateIsCachable) {
-            if (mCacheHost == null) {
-                Log.d(TAG, "Template is cachable, but there's no cache host for this instance?");
-            } else {
-                mCacheIndex = mCacheHost.getCacheIndex(data);
-            }
-        }
-
-        String entityKey = loadCalloutDataMapKey(nodeContext);
-        AsyncEntity entity =
-                new AsyncEntity(detail.getFields(), nodeContext, data, mVariableDeclarations,
-                        mEntityCache, mCacheIndex, detail.getId(), entityKey);
-
-        if (mCacheIndex != null) {
-            mEntitySet.put(mCacheIndex, entity);
-        }
-        return entity;
-    }
-
-    @Override
-    protected void setEvaluationContextDefaultQuerySet(EvaluationContext ec,
-                                                       List<TreeReference> result) {
-
-        //Don't do anything for asynchronous lists. In theory the query set could help expand the
-        //first cache more quickly, but otherwise it's just keeping around tons of cases in memory
-        //that don't even need to be loaded.
-    }
-
-
-    /**
-     * Bulk loads search field cache from db.
-     * Note that the cache is lazily built upon first case list search.
-     */
-    private void primeCache() {
-        if (mTemplateIsCachable == null || !mTemplateIsCachable || mCacheHost == null) {
-            return;
-        }
-
-        String[][] cachePrimeKeys = mCacheHost.getCachePrimeGuess();
-        if (cachePrimeKeys == null) {
-            return;
-        }
-
-        Vector<Integer> sortKeys = new Vector<>();
-        String validKeys = buildValidKeys(sortKeys, detail.getFields());
-        if ("".equals(validKeys)) {
-            return;
-        }
-
-        //Create our full args tree. We need the elements from the cache primer
-        //along with the specific keys we wanna pull out
-
-        String[] args = new String[cachePrimeKeys[1].length + sortKeys.size()];
-        System.arraycopy(cachePrimeKeys[1], 0, args, 0, cachePrimeKeys[1].length);
-
-        for (int i = 0; i < sortKeys.size(); ++i) {
-            args[cachePrimeKeys[1].length + i] = getCacheKey(detail.getId(), String.valueOf(sortKeys.get(i)));
-        }
-
-        String[] names = cachePrimeKeys[0];
-        String whereClause = buildKeyNameWhereClause(names);
-
-        long now = System.currentTimeMillis();
-
-        SQLiteDatabase db = CommCareApplication.instance().getUserDbHandle();
-
-        String sqlStatement = "SELECT entity_key, cache_key, value FROM entity_cache JOIN AndroidCase ON entity_cache.entity_key = AndroidCase.commcare_sql_id WHERE " +
-                whereClause + " AND " + EntityStorageCache.COL_APP_ID + " = '" + AppUtils.getCurrentAppId() +
-                "' AND cache_key IN " + validKeys;
-        if (SqlStorage.STORAGE_OUTPUT_DEBUG) {
-            DbUtil.explainSql(db, sqlStatement, args);
-        }
-
-        populateEntitySet(db, sqlStatement, args);
-
-        if (SqlStorage.STORAGE_OUTPUT_DEBUG) {
-            Log.d(TAG, "Sequential Cache Load: " + (System.currentTimeMillis() - now) + "ms");
-        }
-    }
-
-    private String buildValidKeys(Vector<Integer> sortKeys, DetailField[] fields) {
-        String validKeys = "(";
-        boolean added = false;
-        for (int i = 0; i < fields.length; ++i) {
-            //We're only gonna pull out the fields we can index/sort on
-            if (fields[i].getSort() != null) {
-                sortKeys.add(i);
-                validKeys += "?, ";
-                added = true;
-            }
-        }
-        if (added) {
-            return validKeys.substring(0, validKeys.length() - 2) + ")";
-        } else {
-            return "";
-        }
-    }
-
-    public static String getCacheKey(String detailId, String mFieldId) {
-        return detailId + "_" + mFieldId;
-    }
-
-    private String buildKeyNameWhereClause(String[] names) {
-        String whereClause = "";
-        for (int i = 0; i < names.length; ++i) {
-            whereClause += TableBuilder.scrubName(names[i]) + " = ?";
-            if (i + 1 < names.length) {
-                whereClause += " AND ";
-            }
-        }
-        return whereClause;
-    }
-
-    private void populateEntitySet(SQLiteDatabase db, String sqlStatement, String[] args) {
-        //TODO: This will _only_ query up to about a meg of data, which is an un-great limitation.
-        //Should probably split this up SQL LIMIT based looped
-        //For reference the current limitation is about 10k rows with 1 field each.
-        Cursor walker = db.rawQuery(sqlStatement, args);
-        while (walker.moveToNext()) {
-            String entityId = walker.getString(walker.getColumnIndex("entity_key"));
-            String cacheId = walker.getString(walker.getColumnIndex("cache_key"));
-            String val = walker.getString(walker.getColumnIndex("value"));
-            if (this.mEntitySet.containsKey(entityId)) {
-                this.mEntitySet.get(entityId).setSortData(cacheId, val);
-            }
-        }
-        walker.close();
-    }
-
-    @Override
-    protected void prepareEntitiesInternal(List<Entity<TreeReference>> entities) {
-        // if blocking mode load cache on the same thread and set any data thats not cached
-        if (isBlockingAsyncMode) {
-            primeCache();
-            setUnCachedData(entities);
-        } else {
-            // otherwise we want to show the entity list asap and hence want to offload the loading cache part to a separate
-            // thread while caching any uncached data later on UI thread during Adapter's getView
-            synchronized (mAsyncLock) {
-                if (mAsyncPrimingThread == null) {
-                    mAsyncPrimingThread = new Thread(this::primeCache);
-                    mAsyncPrimingThread.start();
-                }
-            }
-        }
-    }
-
-    private void setUnCachedData(List<Entity<TreeReference>> entities) {
-        for (int i = 0; i < entities.size(); i++) {
-            AsyncEntity e = (AsyncEntity)entities.get(i);
-            for (int col = 0; col < e.getNumFields(); ++col) {
-                e.getSortField(col);
-            }
-        }
-    }
-
-    @Override
-    protected boolean isEntitySetReadyInternal() {
-        synchronized (mAsyncLock) {
-            return mAsyncPrimingThread == null || !mAsyncPrimingThread.isAlive();
-        }
-    }
-
-    public boolean isBlockingAsyncMode() {
-        return isBlockingAsyncMode;
-    }
-}
diff --git a/app/src/org/commcare/models/database/InterruptedFormState.java b/app/src/org/commcare/models/database/InterruptedFormState.java
new file mode 100644
index 0000000000..4cbf00bd81
--- /dev/null
+++ b/app/src/org/commcare/models/database/InterruptedFormState.java
@@ -0,0 +1,72 @@
+package org.commcare.models.database;
+
+import org.javarosa.core.model.FormIndex;
+import org.javarosa.core.util.externalizable.DeserializationException;
+import org.javarosa.core.util.externalizable.ExtUtil;
+import org.javarosa.core.util.externalizable.Externalizable;
+import org.javarosa.core.util.externalizable.PrototypeFactory;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
+
+/**
+ * Model to store info about an interrupted form
+ */
+public class InterruptedFormState implements Externalizable {
+
+    private int sessionStateDescriptorId;
+    private FormIndex formIndex;
+    private int formRecordId = -1;
+    private boolean interruptedDueToSessionExpiration = false;
+
+    public InterruptedFormState(int sessionStateDescriptorId, FormIndex formIndex, int formRecordId, boolean sessionExpired) {
+        this.sessionStateDescriptorId = sessionStateDescriptorId;
+        this.formIndex = formIndex;
+        this.formRecordId = formRecordId;
+        this.interruptedDueToSessionExpiration = sessionExpired;
+    }
+
+    public InterruptedFormState() {
+        // serialization only
+    }
+
+    @Override
+    public void readExternal(DataInputStream in, PrototypeFactory pf)
+            throws IOException, DeserializationException {
+        sessionStateDescriptorId = ExtUtil.readInt(in);
+        formIndex = (FormIndex)ExtUtil.read(in, FormIndex.class, pf);
+        try {
+            formRecordId = ExtUtil.readInt(in);
+            interruptedDueToSessionExpiration = ExtUtil.readBool(in);
+        } catch(EOFException e){
+            // this is to catch errors caused by EOF when updating from the previous model which didn't have the
+            // formRecordId and interruptedDueToSessionExpiration fields
+        }
+    }
+
+    @Override
+    public void writeExternal(DataOutputStream out) throws IOException {
+        ExtUtil.writeNumeric(out, sessionStateDescriptorId);
+        ExtUtil.write(out, formIndex);
+        ExtUtil.writeNumeric(out, formRecordId);
+        ExtUtil.writeBool(out, interruptedDueToSessionExpiration);
+    }
+
+    public int getSessionStateDescriptorId() {
+        return sessionStateDescriptorId;
+    }
+
+    public FormIndex getFormIndex() {
+        return formIndex;
+    }
+
+    public boolean isInterruptedDueToSessionExpiration(){
+        return interruptedDueToSessionExpiration;
+    }
+
+    public int getFormRecordId() {
+        return formRecordId;
+    }
+}
diff --git a/app/src/org/commcare/models/database/global/DatabaseGlobalOpenHelper.java b/app/src/org/commcare/models/database/global/DatabaseGlobalOpenHelper.java
index 761ca21fa3..615a3a0be6 100755
--- a/app/src/org/commcare/models/database/global/DatabaseGlobalOpenHelper.java
+++ b/app/src/org/commcare/models/database/global/DatabaseGlobalOpenHelper.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package org.commcare.models.database.global;
 
 import android.content.Context;
@@ -12,6 +9,7 @@
 import org.commcare.android.database.global.models.AndroidSharedKeyRecord;
 import org.commcare.android.database.global.models.AppAvailableToInstall;
 import org.commcare.android.database.global.models.ApplicationRecord;
+import org.commcare.android.database.global.models.ConnectKeyRecord;
 import org.commcare.android.javarosa.AndroidLogEntry;
 import org.commcare.android.logging.ForceCloseLogEntry;
 import org.commcare.logging.DataChangeLog;
@@ -32,8 +30,10 @@ public class DatabaseGlobalOpenHelper extends SQLiteOpenHelper {
      * and InstanceProvider use per-app databases
      * V.4 - Add table for storing force close log entries that occur outside of an active session
      * V.5 - Add table for storing apps available for install
+     * V.6 - Add table for storing (encrypted) passphrase for ConnectId DB
+     * V.7 - Add is_local column to ConnectKeyRecord table (to store both local and server passphrase)
      */
-    private static final int GLOBAL_DB_VERSION = 5;
+    private static final int GLOBAL_DB_VERSION = 7;
 
     private static final String GLOBAL_DB_LOCATOR = "database_global";
 
@@ -66,6 +66,10 @@ public void onCreate(SQLiteDatabase database) {
             builder.addData(new AppAvailableToInstall());
             database.execSQL(builder.getTableCreateString());
 
+            builder = new TableBuilder(ConnectKeyRecord.STORAGE_KEY);
+            builder.addData(new ConnectKeyRecord());
+            database.execSQL(builder.getTableCreateString());
+
             DbUtil.createNumbersTable(database);
 
             database.setVersion(GLOBAL_DB_VERSION);
diff --git a/app/src/org/commcare/models/database/global/GlobalDatabaseUpgrader.java b/app/src/org/commcare/models/database/global/GlobalDatabaseUpgrader.java
index 11b038148b..f9f57166f6 100755
--- a/app/src/org/commcare/models/database/global/GlobalDatabaseUpgrader.java
+++ b/app/src/org/commcare/models/database/global/GlobalDatabaseUpgrader.java
@@ -2,22 +2,25 @@
 
 import android.content.Context;
 
+import java.io.File;
+
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.commcare.CommCareApplication;
 import org.commcare.android.database.global.models.AppAvailableToInstall;
+import org.commcare.android.database.global.models.ApplicationRecord;
+import org.commcare.android.database.global.models.ApplicationRecordV1;
+import org.commcare.android.database.global.models.ConnectKeyRecord;
+import org.commcare.android.database.global.models.ConnectKeyRecordV6;
 import org.commcare.android.logging.ForceCloseLogEntry;
-import org.commcare.modern.database.TableBuilder;
 import org.commcare.models.database.ConcreteAndroidDbHelper;
 import org.commcare.models.database.DbUtil;
 import org.commcare.models.database.MigrationException;
 import org.commcare.models.database.SqlStorage;
-import org.commcare.android.database.global.models.ApplicationRecord;
-import org.commcare.android.database.global.models.ApplicationRecordV1;
+import org.commcare.modern.database.TableBuilder;
 import org.commcare.provider.ProviderUtils;
-import org.javarosa.core.services.storage.Persistable;
 
-import java.io.File;
+import org.javarosa.core.services.storage.Persistable;
 
 /**
  * @author ctsims
@@ -50,6 +53,17 @@ public void upgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                 oldVersion = 5;
             }
         }
+        if (oldVersion == 5) {
+            if (upgradeFiveSix(db)) {
+                oldVersion = 6;
+            }
+        }
+
+        if (oldVersion == 6) {
+            if (upgradeSixSeven(db)) {
+                oldVersion = 7;
+            }
+        }
     }
 
     private boolean upgradeOneTwo(SQLiteDatabase db, int oldVersion, int newVersion) {
@@ -117,6 +131,45 @@ private boolean upgradeFourFive(SQLiteDatabase db) {
         return addTableForNewModel(db, AppAvailableToInstall.STORAGE_KEY, new AppAvailableToInstall());
     }
 
+    private boolean upgradeFiveSix(SQLiteDatabase db) {
+        return addTableForNewModel(db, ConnectKeyRecord.STORAGE_KEY, new ConnectKeyRecordV6());
+    }
+
+    private boolean upgradeSixSeven(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        //Migrate the old ConnectKeyRecord in storage to the new version including isLocal
+        try {
+            db.execSQL(DbUtil.addColumnToTable(
+                    ConnectKeyRecord.STORAGE_KEY,
+                    ConnectKeyRecord.IS_LOCAL,
+                    "TEXT"));
+
+            SqlStorage<Persistable> oldStorage = new SqlStorage<>(
+                    ConnectKeyRecordV6.STORAGE_KEY,
+                    ConnectKeyRecordV6.class,
+                    new ConcreteAndroidDbHelper(c, db));
+
+            SqlStorage<Persistable> newStorage = new SqlStorage<>(
+                    ConnectKeyRecord.STORAGE_KEY,
+                    ConnectKeyRecord.class,
+                    new ConcreteAndroidDbHelper(c, db));
+
+            for (Persistable r : oldStorage) {
+                ConnectKeyRecordV6 oldRecord = (ConnectKeyRecordV6)r;
+                ConnectKeyRecord newRecord = ConnectKeyRecord.fromV6(oldRecord);
+                //set this new record to have same ID as the old one
+                newRecord.setID(oldRecord.getID());
+                newStorage.write(newRecord);
+            }
+
+            db.setTransactionSuccessful();
+            return true;
+        } finally {
+            db.endTransaction();
+        }
+    }
+
     private static boolean addTableForNewModel(SQLiteDatabase db, String storageKey,
                                                Persistable modelToAdd) {
         db.beginTransaction();
@@ -127,8 +180,6 @@ private static boolean addTableForNewModel(SQLiteDatabase db, String storageKey,
 
             db.setTransactionSuccessful();
             return true;
-        } catch (Exception e) {
-            return false;
         } finally {
             db.endTransaction();
         }
diff --git a/app/src/org/commcare/models/database/user/DatabaseUserOpenHelper.java b/app/src/org/commcare/models/database/user/DatabaseUserOpenHelper.java
index a9560f0931..ff0ea70c0c 100755
--- a/app/src/org/commcare/models/database/user/DatabaseUserOpenHelper.java
+++ b/app/src/org/commcare/models/database/user/DatabaseUserOpenHelper.java
@@ -20,7 +20,7 @@
 import org.commcare.models.database.IndexedFixturePathUtils;
 import org.commcare.android.database.user.models.ACase;
 import org.commcare.models.database.user.models.AndroidCaseIndexTable;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.android.database.user.models.FormRecord;
 import org.commcare.android.database.user.models.SessionStateDescriptor;
 import org.commcare.modern.database.DatabaseIndexingUtils;
@@ -162,8 +162,8 @@ public void onCreate(SQLiteDatabase database) {
 
             DbUtil.createNumbersTable(database);
 
-            database.execSQL(EntityStorageCache.getTableDefinition());
-            EntityStorageCache.createIndexes(database);
+            database.execSQL(CommCareEntityStorageCache.getTableDefinition());
+            CommCareEntityStorageCache.createIndexes(database);
 
             database.execSQL(AndroidCaseIndexTable.getTableDefinition());
             AndroidCaseIndexTable.createIndexes(database);
diff --git a/app/src/org/commcare/models/database/user/UserDatabaseUpgrader.java b/app/src/org/commcare/models/database/user/UserDatabaseUpgrader.java
index ee68f309a7..895ac83ff5 100755
--- a/app/src/org/commcare/models/database/user/UserDatabaseUpgrader.java
+++ b/app/src/org/commcare/models/database/user/UserDatabaseUpgrader.java
@@ -30,7 +30,7 @@
 import org.commcare.android.database.user.models.ACasePreV6Model;
 import org.commcare.android.database.user.models.AUser;
 import org.commcare.models.database.user.models.AndroidCaseIndexTable;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.android.database.user.models.FormRecord;
 import org.commcare.android.database.user.models.FormRecordV1;
 import org.commcare.android.database.user.models.GeocodeCacheModel;
@@ -283,8 +283,8 @@ private boolean upgradeFiveSix(SQLiteDatabase db) {
             db.execSQL(DatabaseIndexingUtils.indexOnTableCommand("case_status_open_index", "AndroidCase", "case_type,case_status"));
 
             DbUtil.createNumbersTable(db);
-            db.execSQL(EntityStorageCache.getTableDefinition());
-            EntityStorageCache.createIndexes(db);
+            db.execSQL(CommCareEntityStorageCache.getTableDefinition());
+            CommCareEntityStorageCache.createIndexes(db);
 
             db.execSQL(AndroidCaseIndexTablePreV21.getTableDefinition());
             AndroidCaseIndexTable.createIndexes(db);
@@ -626,8 +626,8 @@ private boolean upgradeTwentyOneTwentyTwo(SQLiteDatabase db) {
         //drop the existing table and recreate using current definition
         db.beginTransaction();
         try {
-            db.execSQL("DROP TABLE IF EXISTS " + EntityStorageCache.TABLE_NAME);
-            db.execSQL(EntityStorageCache.getTableDefinition());
+            db.execSQL("DROP TABLE IF EXISTS " + CommCareEntityStorageCache.TABLE_NAME);
+            db.execSQL(CommCareEntityStorageCache.getTableDefinition());
             db.setTransactionSuccessful();
             return true;
         } finally {
diff --git a/app/src/org/commcare/models/database/user/models/EntityStorageCache.java b/app/src/org/commcare/models/database/user/models/CommCareEntityStorageCache.java
similarity index 58%
rename from app/src/org/commcare/models/database/user/models/EntityStorageCache.java
rename to app/src/org/commcare/models/database/user/models/CommCareEntityStorageCache.java
index 4bbe38ea46..2e12deadf5 100755
--- a/app/src/org/commcare/models/database/user/models/EntityStorageCache.java
+++ b/app/src/org/commcare/models/database/user/models/CommCareEntityStorageCache.java
@@ -8,21 +8,29 @@
 
 import org.commcare.AppUtils;
 import org.commcare.CommCareApplication;
-import org.commcare.android.logging.ReportingUtils;
-import org.commcare.modern.database.TableBuilder;
+import org.commcare.cases.entity.AsyncEntity;
+import org.commcare.cases.entity.EntityStorageCache;
+import org.commcare.models.database.DbUtil;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.modern.database.DatabaseHelper;
 import org.commcare.modern.database.DatabaseIndexingUtils;
+import org.commcare.modern.database.TableBuilder;
 import org.commcare.modern.util.Pair;
+import org.commcare.suite.model.Detail;
+import org.commcare.suite.model.DetailField;
+import org.commcare.utils.SessionUnavailableException;
 
+import java.io.Closeable;
 import java.util.Collection;
+import java.util.Hashtable;
 import java.util.List;
+import java.util.Vector;
 
 /**
  * @author ctsims
  */
-public class EntityStorageCache {
-    private static final String TAG = EntityStorageCache.class.getSimpleName();
+public class CommCareEntityStorageCache implements EntityStorageCache {
+    private static final String TAG = CommCareEntityStorageCache.class.getSimpleName();
     public static final String TABLE_NAME = "entity_cache";
 
     public static final String COL_APP_ID = "app_id";
@@ -37,11 +45,11 @@ public class EntityStorageCache {
     private final String mCacheName;
     private final String mAppId;
 
-    public EntityStorageCache(String cacheName) {
+    public CommCareEntityStorageCache(String cacheName) {
         this(cacheName, CommCareApplication.instance().getUserDbHandle(), AppUtils.getCurrentAppId());
     }
 
-    public EntityStorageCache(String cacheName, SQLiteDatabase db, String appId) {
+    public CommCareEntityStorageCache(String cacheName, SQLiteDatabase db, String appId) {
         this.db = db;
         this.mCacheName = cacheName;
         this.mAppId = appId;
@@ -65,6 +73,17 @@ public static void createIndexes(SQLiteDatabase db) {
         db.execSQL(DatabaseIndexingUtils.indexOnTableCommand("NAME_ENTITY_KEY", TABLE_NAME, COL_CACHE_NAME + ", " + COL_ENTITY_KEY + ", " + COL_CACHE_KEY));
     }
 
+    public Closeable lockCache() {
+        //Get a db handle so we can get an outer lock
+        SQLiteDatabase db = CommCareApplication.instance().getUserDbHandle();
+        //get the db lock
+        db.beginTransaction();
+        return () -> {
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        };
+    }
+
     //TODO: We should do some synchronization to make it the case that nothing can hold
     //an object for the same cache at once
 
@@ -125,7 +144,7 @@ public void invalidateCaches(Collection<Integer> recordIds) {
     }
 
 
-    public static int getSortFieldIdFromCacheKey(String detailId, String cacheKey) {
+    public int getSortFieldIdFromCacheKey(String detailId, String cacheKey) {
         String intId = cacheKey.substring(detailId.length() + 1);
         try {
             return Integer.parseInt(intId);
@@ -163,4 +182,87 @@ public static int getEntityCacheWipedPref(String uuid) {
         return CommCareApplication.instance().getCurrentApp().getAppPreferences()
                 .getInt(uuid + "_" + ENTITY_CACHE_WIPED_PREF_SUFFIX, -1);
     }
+
+    public void primeCache(Hashtable<String, AsyncEntity> entitySet, String[][] cachePrimeKeys,
+            Detail detail) {
+        Vector<Integer> sortKeys = new Vector<>();
+        String validKeys = buildValidKeys(sortKeys, detail.getFields());
+        if ("".equals(validKeys)) {
+            return;
+        }
+
+        //Create our full args tree. We need the elements from the cache primer
+        //along with the specific keys we wanna pull out
+
+        String[] args = new String[cachePrimeKeys[1].length + sortKeys.size()];
+        System.arraycopy(cachePrimeKeys[1], 0, args, 0, cachePrimeKeys[1].length);
+
+        for (int i = 0; i < sortKeys.size(); ++i) {
+            args[cachePrimeKeys[1].length + i] = getCacheKey(detail.getId(), String.valueOf(sortKeys.get(i)));
+        }
+
+        String[] names = cachePrimeKeys[0];
+        String whereClause = buildKeyNameWhereClause(names);
+        long now = System.currentTimeMillis();
+        String sqlStatement = "SELECT entity_key, cache_key, value FROM entity_cache JOIN AndroidCase ON entity_cache.entity_key = AndroidCase.commcare_sql_id WHERE " +
+                whereClause + " AND " + CommCareEntityStorageCache.COL_APP_ID + " = '" + AppUtils.getCurrentAppId() +
+                "' AND cache_key IN " + validKeys;
+        SQLiteDatabase db = CommCareApplication.instance().getUserDbHandle();
+        if (SqlStorage.STORAGE_OUTPUT_DEBUG) {
+            DbUtil.explainSql(db, sqlStatement, args);
+        }
+
+        populateEntitySet(db, sqlStatement, args, entitySet);
+
+        if (SqlStorage.STORAGE_OUTPUT_DEBUG) {
+            Log.d(TAG, "Sequential Cache Load: " + (System.currentTimeMillis() - now) + "ms");
+        }
+    }
+
+    public String getCacheKey(String detailId, String mFieldId) {
+        return detailId + "_" + mFieldId;
+    }
+
+    private static String buildValidKeys(Vector<Integer> sortKeys, DetailField[] fields) {
+        String validKeys = "(";
+        boolean added = false;
+        for (int i = 0; i < fields.length; ++i) {
+            //We're only gonna pull out the fields we can index/sort on
+            if (fields[i].getSort() != null) {
+                sortKeys.add(i);
+                validKeys += "?, ";
+                added = true;
+            }
+        }
+        if (added) {
+            return validKeys.substring(0, validKeys.length() - 2) + ")";
+        } else {
+            return "";
+        }
+    }
+
+    private static String buildKeyNameWhereClause(String[] names) {
+        String whereClause = "";
+        for (int i = 0; i < names.length; ++i) {
+            whereClause += TableBuilder.scrubName(names[i]) + " = ?";
+            if (i + 1 < names.length) {
+                whereClause += " AND ";
+            }
+        }
+        return whereClause;
+    }
+
+    private static void populateEntitySet(SQLiteDatabase db, String sqlStatement, String[] args,
+            Hashtable<String, AsyncEntity> entitySet) {
+        Cursor walker = db.rawQuery(sqlStatement, args);
+        while (walker.moveToNext()) {
+            String entityId = walker.getString(walker.getColumnIndex("entity_key"));
+            String cacheId = walker.getString(walker.getColumnIndex("cache_key"));
+            String val = walker.getString(walker.getColumnIndex("value"));
+            if (entitySet.containsKey(entityId)) {
+                entitySet.get(entityId).setSortData(cacheId, val);
+            }
+        }
+        walker.close();
+    }
 }
diff --git a/app/src/org/commcare/models/encryption/CipherPool.java b/app/src/org/commcare/models/encryption/CipherPool.java
deleted file mode 100755
index 2283bb2574..0000000000
--- a/app/src/org/commcare/models/encryption/CipherPool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.commcare.models.encryption;
-
-import android.util.Log;
-
-import java.util.HashSet;
-import java.util.Stack;
-
-import javax.crypto.Cipher;
-
-/**
- * @author ctsims
- */
-public abstract class CipherPool {
-    private static final String TAG = CipherPool.class.getSimpleName();
-
-    private static final int GROWTH_FACTOR = 5;
-
-    private final HashSet<Cipher> issued = new HashSet<>();
-    private final Stack<Cipher> free = new Stack<>();
-
-    //TODO: Pass in factory and finalize all API's rather than
-    //leaving the class to be anonymous?
-    public CipherPool() {
-
-    }
-
-    public synchronized final void init() {
-        grow();
-    }
-
-    public synchronized final Cipher borrow() {
-        if (free.isEmpty()) {
-            grow();
-            Log.d(TAG, "Growing cipher pool. Current size is: " + free.size() + issued.size());
-        }
-        Cipher toLend = free.pop();
-        issued.add(toLend);
-        return toLend;
-    }
-
-    public synchronized final void remit(Cipher cipher) {
-        issued.remove(cipher);
-        free.push(cipher);
-    }
-
-    private synchronized void grow() {
-        for (int i = 0; i < GROWTH_FACTOR; ++i) {
-            free.push(generateNewCipher());
-        }
-    }
-
-    protected abstract Cipher generateNewCipher();
-
-    public synchronized final void expire() {
-        //do we want to try to destroy the final object here?
-        issued.clear();
-        free.clear();
-    }
-}
diff --git a/app/src/org/commcare/models/legacy/DecryptingCursor.java b/app/src/org/commcare/models/legacy/DecryptingCursor.java
deleted file mode 100755
index 0f3d153d28..0000000000
--- a/app/src/org/commcare/models/legacy/DecryptingCursor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.commcare.models.legacy;
-
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQuery;
-
-import org.commcare.models.encryption.CipherPool;
-import org.commcare.core.encryption.CryptUtil;
-import org.commcare.modern.database.DatabaseHelper;
-import org.commcare.modern.models.EncryptedModel;
-
-import javax.crypto.Cipher;
-
-/**
- * @author ctsims
- */
-public class DecryptingCursor extends SQLiteCursor {
-    final Cipher cipher;
-    final EncryptedModel model;
-    final CipherPool pool;
-
-    public DecryptingCursor(SQLiteDatabase db, SQLiteCursorDriver driver, String editTable, SQLiteQuery query, EncryptedModel model, CipherPool pool) {
-        super(db, driver, editTable, query);
-        this.model = model;
-        this.pool = pool;
-        this.cipher = pool.borrow();
-    }
-
-    @Override
-    public byte[] getBlob(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getBlob(columnIndex);
-        } else {
-            return decrypt(columnIndex);
-        }
-    }
-
-    @Override
-    public double getDouble(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getDouble(columnIndex);
-        } else {
-            return Double.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public float getFloat(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getFloat(columnIndex);
-        } else {
-            return Float.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public int getInt(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getInt(columnIndex);
-        } else {
-            return Integer.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public long getLong(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getLong(columnIndex);
-        } else {
-            return Long.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public short getShort(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getShort(columnIndex);
-        } else {
-            return Short.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public String getString(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getString(columnIndex);
-        } else {
-            return new String(decrypt(columnIndex));
-        }
-    }
-
-    private boolean isEncrypted(int columnIndex) {
-        String column = this.getColumnName(columnIndex);
-        if (model.isEncrypted(column)) {
-            return true;
-        }
-        return (column.equals(DatabaseHelper.DATA_COL) &&
-                model.isBlobEncrypted());
-    }
-
-    private byte[] decrypt(int columnIndex) {
-        byte[] data = super.getBlob(columnIndex);
-        return CryptUtil.decrypt(data, cipher);
-    }
-
-
-    @Override
-    public void close() {
-        super.close();
-        pool.remit(cipher);
-    }
-}
diff --git a/app/src/org/commcare/network/CTInterceptorConfig.kt b/app/src/org/commcare/network/CTInterceptorConfig.kt
new file mode 100644
index 0000000000..7882492949
--- /dev/null
+++ b/app/src/org/commcare/network/CTInterceptorConfig.kt
@@ -0,0 +1,58 @@
+package org.commcare.network
+
+import com.appmattus.certificatetransparency.CTLogger
+import com.appmattus.certificatetransparency.VerificationResult
+import com.appmattus.certificatetransparency.certificateTransparencyInterceptor
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import org.commcare.preferences.HiddenPreferences
+import org.commcare.util.LogTypes
+import org.javarosa.core.services.Logger
+
+/**
+ * Adds and removes Certificate Transparency (CT) network interceptor
+ *
+ */
+class CTInterceptorConfig {
+
+    companion object {
+        private var interceptor: Interceptor? = null
+        private var previousRequestFailed = false
+        private var interceptorAttached = false
+
+        @JvmStatic
+        fun toggleCertificateTransparency(client: OkHttpClient.Builder) {
+            if (HiddenPreferences.isCertificateTransparencyEnabled()) {
+                if (!interceptorAttached) {
+                    client.addNetworkInterceptor(getCTInterceptor())
+                    interceptorAttached = true
+                }
+            } else if (interceptorAttached) {
+                removeCTInterceptors(client)
+                interceptorAttached = false
+            }
+        }
+
+        private fun getCTInterceptor(): Interceptor {
+            if (interceptor == null) {
+                interceptor = certificateTransparencyInterceptor {
+                    logger = object : CTLogger {
+                        override fun log(host: String, result: VerificationResult) {
+                            if (result is VerificationResult.Failure && !previousRequestFailed) {
+                                Logger.log(
+                                        LogTypes.TYPE_NETWORK,
+                                        "Certificate verification failed: $host -> $result")
+                            }
+                            previousRequestFailed = result is VerificationResult.Failure
+                        }
+                    }
+                }
+            }
+            return interceptor!!
+        }
+
+        private fun removeCTInterceptors(client: OkHttpClient.Builder) {
+            client.networkInterceptors().removeAll { it === interceptor }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/org/commcare/network/CommcareRequestEndpointsMock.java b/app/src/org/commcare/network/CommcareRequestEndpointsMock.java
index 0d7a5bb831..77a0c8fd69 100644
--- a/app/src/org/commcare/network/CommcareRequestEndpointsMock.java
+++ b/app/src/org/commcare/network/CommcareRequestEndpointsMock.java
@@ -46,7 +46,7 @@ public static void setErrorResponseBody(String body) {
     }
 
     @Override
-    public Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean includeStateFlags)
+    public Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean includeStateFlags, boolean skipFixtures)
             throws IOException {
         int responseCode;
         if (caseFetchResponseCodeStack.size() > 0) {
diff --git a/app/src/org/commcare/network/CommcareRequestGenerator.java b/app/src/org/commcare/network/CommcareRequestGenerator.java
index 3904b44830..fe93332b8d 100755
--- a/app/src/org/commcare/network/CommcareRequestGenerator.java
+++ b/app/src/org/commcare/network/CommcareRequestGenerator.java
@@ -94,7 +94,7 @@ public static CommcareRequestGenerator buildNoAuthGenerator() {
     }
 
     @Override
-    public Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean includeStateFlags) throws IOException {
+    public Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean includeStateFlags, boolean skipFixtures) throws IOException {
         Multimap<String, String> params = ArrayListMultimap.create();
 
         Uri serverUri = Uri.parse(baseUri);
@@ -139,6 +139,10 @@ public Response<ResponseBody> makeCaseFetchRequest(String baseUri, boolean inclu
             CommCareApplication.instance().setInvalidateCacheFlag(false);
         }
 
+        if (skipFixtures) {
+            params.put("skip_fixtures", "true");
+        }
+
         requester = CommCareApplication.instance().createGetRequester(
                 CommCareApplication.instance(),
                 baseUri,
diff --git a/app/src/org/commcare/network/DataPullRequester.java b/app/src/org/commcare/network/DataPullRequester.java
index 24d30ea40c..0d794c5de2 100644
--- a/app/src/org/commcare/network/DataPullRequester.java
+++ b/app/src/org/commcare/network/DataPullRequester.java
@@ -24,7 +24,8 @@ public interface DataPullRequester {
     RemoteDataPullResponse makeDataPullRequest(DataPullTask task,
                                                CommcareRequestEndpoints requestor,
                                                String server,
-                                               boolean includeSyncToken) throws IOException;
+                                               boolean includeSyncToken,
+                                               boolean skipFixtures) throws IOException;
 
     CommcareRequestEndpoints getHttpGenerator(String username, String password, String userId);
 }
diff --git a/app/src/org/commcare/network/DataPullResponseFactory.java b/app/src/org/commcare/network/DataPullResponseFactory.java
index c1b0f2fb81..756019e307 100644
--- a/app/src/org/commcare/network/DataPullResponseFactory.java
+++ b/app/src/org/commcare/network/DataPullResponseFactory.java
@@ -21,8 +21,9 @@ public enum DataPullResponseFactory implements DataPullRequester {
     public RemoteDataPullResponse makeDataPullRequest(DataPullTask task,
                                                       CommcareRequestEndpoints requestor,
                                                       String server,
-                                                      boolean includeSyncToken) throws IOException {
-        Response<ResponseBody> response = requestor.makeCaseFetchRequest(server, includeSyncToken);
+                                                      boolean includeSyncToken,
+                                                      boolean skipFixtures) throws IOException {
+        Response<ResponseBody> response = requestor.makeCaseFetchRequest(server, includeSyncToken, skipFixtures);
         return new RemoteDataPullResponse(task, response);
     }
 
diff --git a/app/src/org/commcare/network/GetAndParseActor.java b/app/src/org/commcare/network/GetAndParseActor.java
index 7f23ab1958..83b2ab757b 100644
--- a/app/src/org/commcare/network/GetAndParseActor.java
+++ b/app/src/org/commcare/network/GetAndParseActor.java
@@ -64,14 +64,15 @@ public void makeRequest() {
     protected final HttpResponseProcessor responseProcessor = new HttpResponseProcessor() {
 
         @Override
-        public void processSuccess(int responseCode, InputStream responseStream) {
+        public void processSuccess(int responseCode, InputStream responseStream, String apiVersion) {
             try {
                 String responseAsString = new String(StreamsUtil.inputStreamToByteArray(responseStream));
                 JSONObject jsonResponse = new JSONObject(responseAsString);
                 parseResponse(jsonResponse);
             } catch (JSONException e) {
                 Logger.log(LogTypes.TYPE_ERROR_SERVER_COMMS,
-                        String.format("%s response was not properly-formed JSON: %s", requestName, e.getMessage()));
+                        String.format("%s response was not properly-formed JSON: %s",
+                                requestName, e.getMessage()));
             } catch (IOException e) {
                 Logger.log(LogTypes.TYPE_ERROR_SERVER_COMMS,
                         String.format("IO error while processing %s response: %s", requestName, e.getMessage()));
@@ -128,7 +129,8 @@ protected boolean checkForAppIdMatch(JSONObject responseAsJson) {
                     String.format("%s response did not have required app_id param", this.requestName));
         } catch (JSONException e) {
             Logger.log(LogTypes.TYPE_ERROR_SERVER_COMMS,
-                    String.format("App id in %s response was not properly formatted: %s", this.requestName, e.getMessage()));
+                    String.format("App id in %s response was not properly formatted: %s",
+                            this.requestName, e.getMessage()));
         }
         return false;
     }
diff --git a/app/src/org/commcare/network/ISRGCertConfig.java b/app/src/org/commcare/network/ISRGCertConfig.java
index 6aaf4b6cf4..afe955a154 100644
--- a/app/src/org/commcare/network/ISRGCertConfig.java
+++ b/app/src/org/commcare/network/ISRGCertConfig.java
@@ -1,8 +1,5 @@
 package org.commcare.network;
 
-import android.os.Build;
-
-import org.commcare.core.network.HttpBuilderConfig;
 import org.javarosa.core.services.Logger;
 
 import java.io.ByteArrayInputStream;
@@ -22,61 +19,55 @@
  * https://stackoverflow.com/questions/64844311/certpathvalidatorexception-connecting-to-a-lets-encrypt-host-on-android-m-or-ea
  * for background.
  */
-public class ISRGCertConfig implements HttpBuilderConfig {
-
-    @Override
-    public OkHttpClient.Builder performCustomConfig(OkHttpClient.Builder okHttpBuilder) {
-        boolean androidNorEarlier = Build.VERSION.SDK_INT <= 25;
+public class ISRGCertConfig {
 
-        if (androidNorEarlier) {
-            String isgCert =
-                    "-----BEGIN CERTIFICATE-----\n" +
-                            "MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw\n" +
-                            "TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh\n" +
-                            "cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4\n" +
-                            "WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu\n" +
-                            "ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY\n" +
-                            "MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc\n" +
-                            "h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+\n" +
-                            "0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U\n" +
-                            "A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW\n" +
-                            "T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH\n" +
-                            "B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC\n" +
-                            "B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv\n" +
-                            "KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn\n" +
-                            "OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn\n" +
-                            "jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw\n" +
-                            "qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI\n" +
-                            "rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\n" +
-                            "HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq\n" +
-                            "hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL\n" +
-                            "ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ\n" +
-                            "3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK\n" +
-                            "NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5\n" +
-                            "ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur\n" +
-                            "TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC\n" +
-                            "jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc\n" +
-                            "oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq\n" +
-                            "4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA\n" +
-                            "mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d\n" +
-                            "emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=\n" +
-                            "-----END CERTIFICATE-----";
+    public static void attachISRGRootCertificate(OkHttpClient.Builder okHttpBuilder) {
+        String isgCert =
+                "-----BEGIN CERTIFICATE-----\n" +
+                        "MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw\n" +
+                        "TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh\n" +
+                        "cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4\n" +
+                        "WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu\n" +
+                        "ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY\n" +
+                        "MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc\n" +
+                        "h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+\n" +
+                        "0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U\n" +
+                        "A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW\n" +
+                        "T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH\n" +
+                        "B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC\n" +
+                        "B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv\n" +
+                        "KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn\n" +
+                        "OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn\n" +
+                        "jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw\n" +
+                        "qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI\n" +
+                        "rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\n" +
+                        "HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq\n" +
+                        "hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL\n" +
+                        "ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ\n" +
+                        "3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK\n" +
+                        "NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5\n" +
+                        "ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur\n" +
+                        "TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC\n" +
+                        "jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc\n" +
+                        "oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq\n" +
+                        "4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA\n" +
+                        "mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d\n" +
+                        "emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=\n" +
+                        "-----END CERTIFICATE-----";
 
-            try {
-                CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                Certificate isgCertificate = cf.generateCertificate(new ByteArrayInputStream(isgCert.getBytes("UTF-8")));
+        try {
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            Certificate isgCertificate = cf.generateCertificate(new ByteArrayInputStream(isgCert.getBytes("UTF-8")));
 
-                HandshakeCertificates certificates = new HandshakeCertificates.Builder()
-                        .addTrustedCertificate((X509Certificate)isgCertificate)
-                        .addPlatformTrustedCertificates()
-                        .build();
+            HandshakeCertificates certificates = new HandshakeCertificates.Builder()
+                    .addTrustedCertificate((X509Certificate) isgCertificate)
+                    .addPlatformTrustedCertificates()
+                    .build();
 
-                okHttpBuilder.sslSocketFactory(certificates.sslSocketFactory(), certificates.trustManager());
-            } catch (CertificateException | UnsupportedEncodingException e) {
-                Logger.exception("Failed to pin ISG cert ", e);
-                e.printStackTrace();
-            }
+            okHttpBuilder.sslSocketFactory(certificates.sslSocketFactory(), certificates.trustManager());
+        } catch (CertificateException | UnsupportedEncodingException e) {
+            Logger.exception("Failed to pin ISG cert ", e);
+            e.printStackTrace();
         }
-        return okHttpBuilder;
     }
 }
diff --git a/app/src/org/commcare/network/LocalReferencePullResponseFactory.java b/app/src/org/commcare/network/LocalReferencePullResponseFactory.java
index 54c38ecd41..9c9ef59483 100644
--- a/app/src/org/commcare/network/LocalReferencePullResponseFactory.java
+++ b/app/src/org/commcare/network/LocalReferencePullResponseFactory.java
@@ -37,9 +37,10 @@ public static int getNumRequestsMade() {
     public RemoteDataPullResponse makeDataPullRequest(DataPullTask task,
                                                       CommcareRequestEndpoints requestor,
                                                       String server,
-                                                      boolean includeSyncToken) throws IOException {
+                                                      boolean includeSyncToken,
+                                                      boolean skipFixtures) throws IOException {
         numTries++;
-        Response<ResponseBody> response = requestor.makeCaseFetchRequest(server, includeSyncToken);
+        Response<ResponseBody> response = requestor.makeCaseFetchRequest(server, includeSyncToken, skipFixtures);
         return new LocalReferencePullResponse(xmlPayloadReferences.remove(0), response);
     }
 
diff --git a/app/src/org/commcare/network/OkHttpBuilderCustomConfig.java b/app/src/org/commcare/network/OkHttpBuilderCustomConfig.java
new file mode 100644
index 0000000000..8a33a45cb7
--- /dev/null
+++ b/app/src/org/commcare/network/OkHttpBuilderCustomConfig.java
@@ -0,0 +1,28 @@
+package org.commcare.network;
+
+import android.os.Build;
+
+import org.commcare.core.network.HttpBuilderConfig;
+
+import okhttp3.OkHttpClient;
+
+/**
+ * The purpose of this class is to offer a single entry point for additional OkHttpClient.Builder
+ * configs. As it stands, it serves to attach the ISRG Root X1 Certificate and enable/disable
+ * Certificate Transparency
+ */
+public class OkHttpBuilderCustomConfig implements HttpBuilderConfig {
+
+    @Override
+    public OkHttpClient.Builder performCustomConfig(OkHttpClient.Builder okHttpBuilder) {
+        // Enable or Disable CT, depending on the current value of the preference
+        CTInterceptorConfig.toggleCertificateTransparency(okHttpBuilder);
+
+        // Attach ISRG Root Certificate when running Android 7.1 and below
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) {
+            ISRGCertConfig.attachISRGRootCertificate(okHttpBuilder);
+        }
+
+        return okHttpBuilder;
+    }
+}
diff --git a/app/src/org/commcare/network/mocks/LocalFilePullResponseFactory.java b/app/src/org/commcare/network/mocks/LocalFilePullResponseFactory.java
index a0a00632b7..f83a8b8b9f 100644
--- a/app/src/org/commcare/network/mocks/LocalFilePullResponseFactory.java
+++ b/app/src/org/commcare/network/mocks/LocalFilePullResponseFactory.java
@@ -36,8 +36,9 @@ public static void setRequestPayloads(File[] payloadReferences) {
     public RemoteDataPullResponse makeDataPullRequest(DataPullTask task,
                                                       CommcareRequestEndpoints requestor,
                                                       String server,
-                                                      boolean includeSyncToken) throws IOException {
-        Response<ResponseBody> response = requestor.makeCaseFetchRequest(server, includeSyncToken);
+                                                      boolean includeSyncToken,
+                                                      boolean skipFixtures) throws IOException {
+        Response<ResponseBody> response = requestor.makeCaseFetchRequest(server, includeSyncToken, skipFixtures);
         return new LocalFilePullResponse(xmlPayloadReferences.remove(0), response);
     }
 
diff --git a/app/src/org/commcare/preferences/AdvancedActionsPreferences.java b/app/src/org/commcare/preferences/AdvancedActionsPreferences.java
index b9fac9880a..6fbba0af02 100644
--- a/app/src/org/commcare/preferences/AdvancedActionsPreferences.java
+++ b/app/src/org/commcare/preferences/AdvancedActionsPreferences.java
@@ -3,7 +3,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.widget.Toast;
 
 import org.commcare.AppUtils;
@@ -37,6 +36,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.Preference;
 
+import static android.app.Activity.RESULT_CANCELED;
+
 /**
  * Menu for launching advanced CommCare actions
  *
@@ -292,14 +293,14 @@ public static void clearUserData(final AppCompatActivity activity) {
         d.showNonPersistentDialog();
     }
 
-    private static String getClearUserDataMessage(int numUnsentAndIncompleteForms){
+    private static String getClearUserDataMessage(int numUnsentAndIncompleteForms) {
         if (numUnsentAndIncompleteForms > 0)
-            return Localization.get("clear.user.data.warning.message.delete.forms",String.valueOf(numUnsentAndIncompleteForms));
+            return Localization.get("clear.user.data.warning.message.delete.forms", String.valueOf(numUnsentAndIncompleteForms));
         else
             return Localization.get("clear.user.data.warning.message");
     }
 
-    private static int getClearUserDataPositiveOption(int numUnsentAndIncompleteForms){
+    private static int getClearUserDataPositiveOption(int numUnsentAndIncompleteForms) {
         if (numUnsentAndIncompleteForms > 0)
             return R.string.clear_user_data_delete_form;
         else
@@ -311,6 +312,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         if (requestCode == REPORT_PROBLEM_ACTIVITY || requestCode == VALIDATE_MEDIA_ACTIVITY) {
             getActivity().finish();
         } else if (requestCode == WIFI_DIRECT_ACTIVITY || requestCode == DUMP_FORMS_ACTIVITY) {
+            if (resultCode == RESULT_CANCELED) {
+                return;
+            }
+
             String messageKey = getBulkFormMessageKey(resultCode);
             if (messageKey == null) {
                 return;
diff --git a/app/src/org/commcare/preferences/DeveloperPreferences.java b/app/src/org/commcare/preferences/DeveloperPreferences.java
index a3153c267c..46af8cbcc2 100644
--- a/app/src/org/commcare/preferences/DeveloperPreferences.java
+++ b/app/src/org/commcare/preferences/DeveloperPreferences.java
@@ -1,5 +1,8 @@
 package org.commcare.preferences;
 
+import static org.commcare.preferences.HiddenPreferences.ENABLE_CERTIFICATE_TRANSPARENCY;
+import static org.commcare.preferences.ServerUrls.PREFS_LOG_POST_URL_KEY;
+
 import androidx.appcompat.app.AppCompatActivity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -82,6 +85,8 @@ public class DeveloperPreferences extends CommCarePreferenceFragment {
         WHITELISTED_DEVELOPER_PREF_KEYS.add(SHOW_UPDATE_OPTIONS_SETTING);
         WHITELISTED_DEVELOPER_PREF_KEYS.add(AUTO_PURGE_ENABLED);
         WHITELISTED_DEVELOPER_PREF_KEYS.add(ALTERNATE_QUESTION_LAYOUT_ENABLED);
+        WHITELISTED_DEVELOPER_PREF_KEYS.add(ENABLE_CERTIFICATE_TRANSPARENCY);
+        WHITELISTED_DEVELOPER_PREF_KEYS.add(PREFS_LOG_POST_URL_KEY);
     }
 
     /**
@@ -117,6 +122,18 @@ protected int getPreferencesResource() {
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
         setHasOptionsMenu(true);
+        EditTextPreference editTextPreference = (EditTextPreference)findPreference(PREFS_LOG_POST_URL_KEY);
+        if (editTextPreference != null) {
+            editTextPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                if (newValue == null || newValue.toString().trim().isEmpty()) {
+                    SharedPreferences appPreferences = CommCareApplication.instance().getCurrentApp()
+                            .getAppPreferences();
+                    appPreferences.edit().remove(PREFS_LOG_POST_URL_KEY).apply();
+                    return false;
+                }
+                return true;
+            });
+        }
     }
 
     @Override
@@ -222,6 +239,9 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                             Toast.LENGTH_SHORT).show();
                 }
                 break;
+            case ENABLE_CERTIFICATE_TRANSPARENCY:
+                CommCareApplication.instance().customiseOkHttp();
+                break;
         }
     }
 
diff --git a/app/src/org/commcare/preferences/HiddenPreferences.java b/app/src/org/commcare/preferences/HiddenPreferences.java
index 134ee59458..cda1288e50 100644
--- a/app/src/org/commcare/preferences/HiddenPreferences.java
+++ b/app/src/org/commcare/preferences/HiddenPreferences.java
@@ -6,9 +6,15 @@
 import org.commcare.CommCareApplication;
 import org.commcare.activities.GeoPointActivity;
 import org.commcare.android.logging.ReportingUtils;
+import org.commcare.models.database.InterruptedFormState;
+import org.commcare.services.FCMMessageData;
+import org.commcare.util.LogTypes;
 import org.commcare.utils.AndroidCommCarePlatform;
+import org.commcare.utils.FirebaseMessagingUtil;
 import org.commcare.utils.GeoUtils;
 import org.commcare.utils.MapLayer;
+import org.commcare.utils.SerializationUtil;
+import org.javarosa.core.services.Logger;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -95,12 +101,22 @@ public class HiddenPreferences {
 
     private static final long NO_OF_HOURS_TO_WAIT_TO_RESUME_BACKGROUND_WORK = 36;
 
+    static final String ENABLE_CERTIFICATE_TRANSPARENCY = "cc-enable-certificate-transparency";
+
     // This is to be used by CommCareFirebaseMessagingService to schedule a sync after the next Login
-    public final static String PENDING_SYNC_REQUEST_FROM_SERVER = "pending-sync-request-from-server";
+    public final static String BACKGROUND_SYNC_PENDING = "background-sync-pending-";
 
     private static final String ENABLE_ANDROID_WINDOW_SECURE_FLAG = "cc-enable-android-window-secure-flag";
+    public final static String DONT_SHOW_PENDING_SYNC_DIALOG = "dont-show-pending-sync-dialog";
+    private static final String ENABLE_BACKGROUND_SYNC = "cc-enable-background-sync";
 
-
+    /**
+     * The domain name in the application profile file comes in the <domain>.commcarehq.org form,
+     * this is standard across the different HQ servers. This constant is to store that suffix and
+     * be used to remove it form the user domain name to match how the domain represented in the backend
+     */
+    public static final String USER_DOMAIN_SERVER_URL_SUFFIX = ".commcarehq.org";
+    private static final String INTERRUPTED_FORM_INDEX = "interrupted-form-index";
 
     /**
      * @return How many seconds should a user session remain open before expiring?
@@ -263,12 +279,25 @@ public static String getUserDomain() {
         return prefs.getString(USER_DOMAIN_SUFFIX, null);
     }
 
+    public static String getUserDomainWithoutServerUrl() {
+        String userDomain = getUserDomain();
+        if (userDomain == null){
+            return null;
+        }
+
+        if (userDomain.contains(USER_DOMAIN_SERVER_URL_SUFFIX)){
+            return userDomain.replace(USER_DOMAIN_SERVER_URL_SUFFIX, "");
+        }
+        return userDomain;
+    }
+
     public static void setPostUpdateSyncNeeded(boolean b) {
         CommCareApplication.instance().getCurrentApp().getAppPreferences().edit()
                 .putBoolean(POST_UPDATE_SYNC_NEEDED, b).apply();
     }
 
     public static void setInterruptedSSD(int ssdId) {
+        Logger.log(LogTypes.TYPE_MAINTENANCE, "Saving interrupted state");
         String currentUserId = CommCareApplication.instance().getCurrentUserId();
         CommCareApplication.instance().getCurrentApp().getAppPreferences().edit()
                 .putInt(ID_OF_INTERRUPTED_SSD + currentUserId, ssdId).apply();
@@ -556,17 +585,87 @@ public static void markRawMediaCleanUpComplete() {
                 .edit().putBoolean(RAW_MEDIA_CLEANUP_COMPLETE, true).apply();
     }
 
-    public static boolean isPendingSyncRequestFromServer() {
+    public static boolean isCertificateTransparencyEnabled() {
+        return DeveloperPreferences.doesPropertyMatch(ENABLE_CERTIFICATE_TRANSPARENCY, PrefValues.NO, PrefValues.YES);
+    }
+
+    public static boolean isPendingSyncRequest(String loggedInUser) {
         return PreferenceManager.getDefaultSharedPreferences(CommCareApplication.instance())
-                .getBoolean(PENDING_SYNC_REQUEST_FROM_SERVER, false);
+                .contains(BACKGROUND_SYNC_PENDING + loggedInUser + "@"+ getUserDomainWithoutServerUrl());
     }
-    public static void setPendingSyncRequestFromServer(boolean syncNeeded) {
+
+    public static void setPendingSyncRequest(FCMMessageData fcmMessageData) {
         PreferenceManager.getDefaultSharedPreferences(CommCareApplication.instance()).edit()
-                .putBoolean(PENDING_SYNC_REQUEST_FROM_SERVER, syncNeeded)
+                .putString(BACKGROUND_SYNC_PENDING + fcmMessageData.getUsername() + "@"+ fcmMessageData.getDomain(),
+                        FirebaseMessagingUtil.serializeFCMMessageData(fcmMessageData))
+                .apply();
+    }
+
+    public static FCMMessageData getPendingSyncRequest(String username) {
+        String serializedMessageData = PreferenceManager.getDefaultSharedPreferences(CommCareApplication.instance())
+                .getString(BACKGROUND_SYNC_PENDING + username + "@"+ getUserDomainWithoutServerUrl(), null);
+        return FirebaseMessagingUtil.deserializeFCMMessageData(serializedMessageData);
+    }
+
+    public static void clearPendingSyncRequest(String loggedInUser) {
+        PreferenceManager.getDefaultSharedPreferences(CommCareApplication.instance()).edit()
+                .remove(BACKGROUND_SYNC_PENDING + loggedInUser + "@"+ getUserDomainWithoutServerUrl())
                 .apply();
     }
 
     public static boolean isFlagSecureEnabled() {
         return DeveloperPreferences.doesPropertyMatch(ENABLE_ANDROID_WINDOW_SECURE_FLAG, PrefValues.NO, PrefValues.YES);
     }
+
+    public static boolean isPendingSyncDialogDisabled() {
+        return CommCareApplication.instance().getCurrentApp().getAppPreferences()
+                .getBoolean(DONT_SHOW_PENDING_SYNC_DIALOG, false);
+    }
+
+    public static void setPendingSyncDialogDisabled(boolean dialogDisabled) {
+        CommCareApplication.instance().getCurrentApp().getAppPreferences().edit()
+                .putBoolean(DONT_SHOW_PENDING_SYNC_DIALOG, dialogDisabled)
+                .apply();
+    }
+
+    /**
+     * This custom property is used to enable background syncing and it works in conjunction
+     * with Firebase Messaging Push Notifications
+     */
+    public static boolean isBackgroundSyncEnabled() {
+        return DeveloperPreferences.doesPropertyMatch(ENABLE_BACKGROUND_SYNC, PrefValues.NO, PrefValues.YES);
+    }
+
+    public static void setInterruptedFormState(InterruptedFormState interruptedFormState) {
+        try {
+            String currentUserId = CommCareApplication.instance().getCurrentUserId();
+            CommCareApplication.instance().getCurrentApp().getAppPreferences().edit()
+                    .putString(INTERRUPTED_FORM_INDEX + currentUserId, SerializationUtil.serializeToString(interruptedFormState))
+                    .apply();
+        } catch (Exception e) {
+            Logger.exception("Error while trying to save interrupted form state into prefs", e);
+        }
+    }
+
+    public static InterruptedFormState getInterruptedFormState() {
+        try {
+            String currentUserId = CommCareApplication.instance().getCurrentUserId();
+            String interruptedFormStateStr = CommCareApplication.instance().getCurrentApp().getAppPreferences()
+                    .getString(INTERRUPTED_FORM_INDEX + currentUserId, null);
+            if (interruptedFormStateStr != null) {
+                return SerializationUtil.deserializeFromString(interruptedFormStateStr,
+                        InterruptedFormState.class);
+            }
+        } catch (Exception e) {
+            Logger.exception("Error while trying to load interrupted form state from prefs", e);
+        }
+        return null;
+    }
+
+    public static void clearInterruptedFormState() {
+        String currentUserId = CommCareApplication.instance().getCurrentUserId();
+        CommCareApplication.instance().getCurrentApp().getAppPreferences().edit()
+                .remove(INTERRUPTED_FORM_INDEX + currentUserId)
+                .apply();
+    }
 }
diff --git a/app/src/org/commcare/preferences/MainConfigurablePreferences.java b/app/src/org/commcare/preferences/MainConfigurablePreferences.java
index aecdf0f9b8..2f6f671436 100755
--- a/app/src/org/commcare/preferences/MainConfigurablePreferences.java
+++ b/app/src/org/commcare/preferences/MainConfigurablePreferences.java
@@ -35,6 +35,7 @@ public class MainConfigurablePreferences
     public final static String ANALYTICS_ENABLED = "cc-analytics-enabled";
     public final static String INTENT_CALLOUT_FOR_SCANNER = "cc-intent-callout-for-scanner";
     public final static String ENABLE_TEXT_TO_SPEECH = "cc-enable-tts";
+    public final static String AUTO_SAVE_FORM_ON_PAUSE = "cc-auto-form-save-on-pause";
 
     // Fake settings that really act as buttons to open a new activity or choice dialog
     private final static String DEVELOPER_SETTINGS = "developer-settings-button";
@@ -182,6 +183,14 @@ public static boolean useIntentCalloutForScanner() {
         return app.getAppPreferences().getString(INTENT_CALLOUT_FOR_SCANNER, PrefValues.NO).equals(PrefValues.YES);
     }
 
+    public static boolean isAutoSaveFormOnPause() {
+        CommCareApp app = CommCareApplication.instance().getCurrentApp();
+        if (app == null) {
+            return false;
+        }
+        return app.getAppPreferences().getString(AUTO_SAVE_FORM_ON_PAUSE, PrefValues.NO).equals(PrefValues.YES);
+    }
+
     public static boolean isTTSEnabled() {
         CommCareApp app = CommCareApplication.instance().getCurrentApp();
         if (app == null) {
diff --git a/app/src/org/commcare/provider/ExternalApiReceiver.java b/app/src/org/commcare/provider/ExternalApiReceiver.java
index 11e3c88519..7be66036df 100755
--- a/app/src/org/commcare/provider/ExternalApiReceiver.java
+++ b/app/src/org/commcare/provider/ExternalApiReceiver.java
@@ -133,7 +133,10 @@ protected void deliverError(Object receiver, Exception e) {
             }
         };
 
-        mProcess.addSubmissionListener(CommCareApplication.instance().getSession().getListenerForSubmissionNotification());
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            mProcess.addSubmissionListener(
+                    CommCareApplication.instance().getSession().getListenerForSubmissionNotification());
+        }
         mProcess.connect(dummyconnector);
         mProcess.execute();
     }
@@ -148,7 +151,8 @@ private void syncData(final Context context) {
                 u.getCachedPwd(),
                 u.getUniqueId(),
                 ServerUrls.getDataServerKey(),
-                context) {
+                context,
+                false) {
 
             @Override
             protected void deliverResult(Object receiver, ResultAndError<PullTaskResult> resultAndErrorMessage) {
diff --git a/app/src/org/commcare/provider/IdentityCalloutHandler.java b/app/src/org/commcare/provider/IdentityCalloutHandler.java
index 3ec7d0359c..a460aa004d 100644
--- a/app/src/org/commcare/provider/IdentityCalloutHandler.java
+++ b/app/src/org/commcare/provider/IdentityCalloutHandler.java
@@ -1,8 +1,10 @@
 package org.commcare.provider;
 
 import android.content.Intent;
+import android.util.Base64;
 
 import org.commcare.android.javarosa.IntentCallout;
+import org.commcare.commcaresupportlibrary.identity.BiometricIdentifier;
 import org.commcare.commcaresupportlibrary.identity.IdentityResponseBuilder;
 import org.commcare.commcaresupportlibrary.identity.model.IdentificationMatch;
 import org.commcare.commcaresupportlibrary.identity.model.MatchResult;
@@ -23,6 +25,7 @@
 import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 
 import androidx.annotation.StringDef;
@@ -37,13 +40,11 @@ public class IdentityCalloutHandler {
 
     public static final String GENERALIZED_IDENTITY_PROVIDER = "generalized_identity_provider";
 
-
     @StringDef({GENERALIZED_IDENTITY_PROVIDER, SimprintsCalloutProcessing.SIMPRINTS_IDENTITY_PROVIDER})
     @Retention(RetentionPolicy.SOURCE)
     public @interface IdentityProvider {
     }
 
-
     public static boolean isIdentityCalloutResponse(Intent intent) {
         return isRegistrationResponse(intent) || isVerificationResponse(intent) || isIdentificationResponse(intent);
     }
@@ -109,8 +110,34 @@ private static boolean processRegistrationReponse(FormDef formDef,
                                                       Hashtable<String, Vector<TreeReference>> responseToRefMap) {
         RegistrationResult registrationResult = intent.getParcelableExtra(IdentityResponseBuilder.REGISTRATION);
         String guid = registrationResult.getGuid();
+
         storeValueFromCalloutInForm(formDef, responseToRefMap, intentQuestionRef, REF_GUID, guid);
-        IntentCallout.setNodeValue(formDef, intentQuestionRef, guid);
+
+        int numOfTemplatesStored = 0;
+        int numOfTemplates = 0;
+        for (Map.Entry<BiometricIdentifier, byte[]> template : registrationResult.getTemplates().entrySet()) {
+            boolean success = storeValueFromCalloutInForm(formDef, responseToRefMap,
+                    intentQuestionRef,
+                    template.getKey().getCalloutResponseKey(),
+                    Base64.encodeToString(template.getValue(), Base64.DEFAULT));
+            if (success) {
+                numOfTemplatesStored++;
+            }
+            numOfTemplates++;
+        }
+
+        String result = "";
+        if (registrationResult.getTemplates().isEmpty() || (numOfTemplates == numOfTemplatesStored)) {
+            result = Localization.get("intent.callout.biometrics.capture.result.success");
+        } else if (numOfTemplates > 0) {
+            if (numOfTemplatesStored == 0) {
+                result = Localization.get("intent.callout.biometrics.capture.result.fail");
+            } else {
+                result = Localization.get("intent.callout.biometrics.capture.result.partialfail");
+            }
+        }
+
+        IntentCallout.setNodeValue(formDef, intentQuestionRef, result);
 
         // Empty out any references present for duplicate handling
         storeValueFromCalloutInForm(formDef, responseToRefMap, intentQuestionRef, REF_MATCH_GUID, "");
diff --git a/app/src/org/commcare/recovery/measures/ExecuteRecoveryMeasuresPresenter.java b/app/src/org/commcare/recovery/measures/ExecuteRecoveryMeasuresPresenter.java
index ee7ff4994e..9e60660812 100644
--- a/app/src/org/commcare/recovery/measures/ExecuteRecoveryMeasuresPresenter.java
+++ b/app/src/org/commcare/recovery/measures/ExecuteRecoveryMeasuresPresenter.java
@@ -48,6 +48,7 @@
 import androidx.appcompat.app.AlertDialog;
 
 import static org.commcare.engine.resource.ResourceInstallUtils.getProfileReference;
+import static org.commcare.engine.resource.ResourceInstallUtils.handleAppInstallResult;
 import static org.commcare.recovery.measures.RecoveryMeasure.MEASURE_TYPE_APP_OFFLINE_REINSTALL_AND_UPDATE;
 import static org.commcare.recovery.measures.RecoveryMeasure.MEASURE_TYPE_APP_REINSTALL_AND_UPDATE;
 import static org.commcare.recovery.measures.RecoveryMeasure.MEASURE_TYPE_APP_UPDATE;
@@ -539,7 +540,7 @@ static class sResourceEngineTask extends ResourceEngineTask<ExecuteRecoveryMeasu
 
         @Override
         protected void deliverResult(ExecuteRecoveryMeasuresActivity receiver, AppInstallStatus result) {
-            CommCareSetupActivity.handleAppInstallResult(this, receiver, result);
+            handleAppInstallResult(this, receiver, result);
         }
 
         @Override
diff --git a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
index 7ac1f48066..58ed5d5fd1 100644
--- a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
+++ b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
@@ -13,10 +13,10 @@
 import org.commcare.CommCareNoficationManager;
 import org.commcare.activities.DispatchActivity;
 import org.commcare.dalvik.R;
+import org.commcare.sync.FirebaseMessagingDataSyncer;
 import org.commcare.util.LogTypes;
 import org.commcare.utils.FirebaseMessagingUtil;
 import org.javarosa.core.services.Logger;
-import org.joda.time.DateTime;
 
 import java.util.Map;
 
@@ -28,10 +28,14 @@
 public class CommCareFirebaseMessagingService extends FirebaseMessagingService {
 
     private final static int FCM_NOTIFICATION = R.string.fcm_notification;
-    private enum ActionTypes{
+    enum ActionTypes{
         SYNC,
         INVALID
     }
+    private FirebaseMessagingDataSyncer dataSyncer;
+    {
+        dataSyncer = new FirebaseMessagingDataSyncer(this);
+    }
 
    /**
     * Upon receiving a new message from FCM, CommCare needs to:
@@ -59,8 +63,8 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
 
         FCMMessageData fcmMessageData = new FCMMessageData(payloadData);
 
-        switch(fcmMessageData.action){
-            case SYNC -> {} // trigger sync for fcmMessageData
+        switch(fcmMessageData.getAction()){
+            case SYNC -> dataSyncer.syncData(fcmMessageData);
             default ->
                     Logger.log(LogTypes.TYPE_FCM, "Invalid FCM action");
         }
@@ -69,7 +73,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
     @Override
     public void onNewToken(String token) {
         // TODO: Remove the token from the log
-        Logger.log(LogTypes.TYPE_FCM, "New registration token was generated"+token);
+        Logger.log(LogTypes.TYPE_FCM, "New registration token was generated: "+token);
         FirebaseMessagingUtil.updateFCMToken(token);
     }
 
@@ -88,61 +92,21 @@ private void showNotification(RemoteMessage.Notification notification) {
         i.setAction(Intent.ACTION_MAIN);
         i.addCategory(Intent.CATEGORY_LAUNCHER);
 
-        PendingIntent contentIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_IMMUTABLE);
-        else
-            contentIntent = PendingIntent.getActivity(this, 0, i, 0);
+        int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
+        }
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, i, pendingIntentFlags);
 
         NotificationCompat.Builder fcmNotification = new NotificationCompat.Builder(this,
-                CommCareNoficationManager.NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID)
+                CommCareNoficationManager.NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID)
                 .setContentTitle(notificationTitle)
                 .setContentText(notificationText)
                 .setContentIntent(contentIntent)
-                .setSmallIcon(R.drawable.notification)
+                .setSmallIcon(R.drawable.commcare_actionbar_logo)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setWhen(System.currentTimeMillis());
 
         mNM.notify(FCM_NOTIFICATION, fcmNotification.build());
     }
-
-    /**
-     * This class is to facilitate handling the FCM Message Data object. It should contain all the
-     * necessary checks and transformations
-     */
-    public class FCMMessageData {
-        private ActionTypes action;
-        private String username;
-        private String domain;
-        private DateTime creationTime;
-
-        private FCMMessageData(Map<String, String> payloadData){
-            this.action = getActionType(payloadData.get("action"));
-            this.username = payloadData.get("username");
-            this.domain = payloadData.get("domain");
-            this.creationTime = convertISO8601ToDateTime(payloadData.get("created_at"));
-        }
-
-        private DateTime convertISO8601ToDateTime(String timeInISO8601) {
-            if (timeInISO8601 == null){
-                return null;
-            }
-            return new DateTime(timeInISO8601);
-        }
-
-        private ActionTypes getActionType(String action) {
-            if (action == null) {
-                return ActionTypes.INVALID;
-            }
-
-            switch (action.toUpperCase()) {
-                case "SYNC" -> {
-                    return ActionTypes.SYNC;
-                }
-                default -> {
-                    return ActionTypes.INVALID;
-                }
-            }
-        }
-    }
 }
diff --git a/app/src/org/commcare/services/CommCareSessionService.java b/app/src/org/commcare/services/CommCareSessionService.java
index 7f3826c30a..a46bb6e598 100644
--- a/app/src/org/commcare/services/CommCareSessionService.java
+++ b/app/src/org/commcare/services/CommCareSessionService.java
@@ -1,5 +1,7 @@
 package org.commcare.services;
 
+import static org.commcare.sync.ExternalDataUpdateHelper.sendBroadcastFailSafe;
+
 import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -7,6 +9,7 @@
 import android.app.Service;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ServiceInfo;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
@@ -27,8 +30,8 @@
 import org.commcare.interfaces.FormSaveCallback;
 import org.commcare.models.database.user.DatabaseUserOpenHelper;
 import org.commcare.models.database.user.UserSandboxUtils;
-import org.commcare.models.encryption.CipherPool;
 import org.commcare.preferences.HiddenPreferences;
+import org.commcare.sync.ExternalDataUpdateHelper;
 import org.commcare.sync.FormSubmissionHelper;
 import org.commcare.tasks.DataSubmissionListener;
 import org.commcare.util.LogTypes;
@@ -82,8 +85,12 @@ public class CommCareSessionService extends Service {
      */
     public static final ReentrantLock sessionAliveLock = new ReentrantLock();
 
+    /**
+     * 2h time in Milliseconds to extend the session if needed
+     */
+    private static final long SESSION_EXTENSION_TIME = 2 * 60 * 60 * 1000;
+
     private Timer maintenanceTimer;
-    private CipherPool pool;
 
     private byte[] key = null;
 
@@ -141,7 +148,6 @@ public CommCareSessionService getService() {
     public void onCreate() {
         mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
         setSessionLength();
-        createCipherPool();
     }
 
     @Override
@@ -154,26 +160,6 @@ public void onTaskRemoved(Intent rootIntent) {
         }
     }
 
-    public void createCipherPool() {
-        pool = new CipherPool() {
-            @Override
-            public Cipher generateNewCipher() {
-                synchronized (lock) {
-                    try {
-                        SecretKeySpec spec = new SecretKeySpec(key, "AES");
-                        Cipher decrypter = Cipher.getInstance("AES");
-                        decrypter.init(Cipher.DECRYPT_MODE, spec);
-
-                        return decrypter;
-                    } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException e) {
-                        e.printStackTrace();
-                    }
-                }
-                return null;
-            }
-        };
-    }
-
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         // We want this service to continue running until it is explicitly
@@ -199,45 +185,14 @@ public IBinder onBind(Intent intent) {
     /**
      * Show a notification while this service is running.
      */
-    @SuppressLint("UnspecifiedImmutableFlag")
     public void showLoggedInNotification(@Nullable User user) {
-        //We always want this click to simply bring the live stack back to the top
-        Intent callable = new Intent(this, DispatchActivity.class);
-        callable.setAction("android.intent.action.MAIN");
-        callable.addCategory("android.intent.category.LAUNCHER");
-
-        // The PendingIntent to launch our activity if the user selects this notification
-        PendingIntent contentIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            contentIntent = PendingIntent.getActivity(this, 0, callable, PendingIntent.FLAG_IMMUTABLE);
-        else
-            contentIntent = PendingIntent.getActivity(this, 0, callable,0);
-
-        String notificationText;
-        if (AppUtils.getInstalledAppRecords().size() > 1) {
-            try {
-                notificationText = Localization.get("notification.logged.in",
-                        new String[]{Localization.get("app.display.name")});
-            } catch (NoLocalizedTextException e) {
-                notificationText = getString(NOTIFICATION);
-            }
+        // Send the notification. This will cause error messages if CommCare doesn't have
+        // permission to post notifications
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            this.startForeground(NOTIFICATION, createSessionNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
         } else {
-            notificationText = getString(NOTIFICATION);
-        }
-
-        // Set the icon, scrolling text and timestamp
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, CommCareNoficationManager.NOTIFICATION_CHANNEL_ERRORS_ID)
-                .setContentTitle(notificationText)
-                .setSmallIcon(R.drawable.notification)
-                .setContentIntent(contentIntent);
-
-        if (user != null) {
-            String contentText = "Session Expires: " + DateFormat.format("MMM dd h:mmaa", sessionExpireDate);
-            notificationBuilder.setContentText(contentText);
+            this.startForeground(NOTIFICATION, createSessionNotification());
         }
-
-        //Send the notification.
-        this.startForeground(NOTIFICATION, notificationBuilder.build());
     }
 
     /**
@@ -247,24 +202,26 @@ public void showLoggedInNotification(@Nullable User user) {
     private void showLoggedOutNotification() {
         this.stopForeground(true);
 
-        Intent i = new Intent(this, DispatchActivity.class);
-        i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-        PendingIntent contentIntent = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-        else
-            contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        Notification notification = new NotificationCompat.Builder(this, CommCareNoficationManager.NOTIFICATION_CHANNEL_USER_SESSION_ID)
-                .setContentTitle(this.getString(R.string.expirenotification))
-                .setContentText("Click here to log back into your session")
-                .setSmallIcon(org.commcare.dalvik.R.drawable.notification)
-                .setContentIntent(contentIntent)
-                .build();
-
-        // Send the notification.
-        mNM.notify(NOTIFICATION, notification);
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            Intent i = new Intent(this, DispatchActivity.class);
+            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+            PendingIntent contentIntent = null;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+                contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+            else
+                contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_UPDATE_CURRENT);
+
+            Notification notification = new NotificationCompat.Builder(this, CommCareNoficationManager.NOTIFICATION_CHANNEL_USER_SESSION_ID)
+                    .setContentTitle(this.getString(R.string.expirenotification))
+                    .setContentText("Click here to log back into your session")
+                    .setSmallIcon(R.drawable.commcare_actionbar_logo)
+                    .setContentIntent(contentIntent)
+                    .build();
+
+            // Send the notification.
+            mNM.notify(NOTIFICATION, notification);
+        }
     }
 
     //Start CommCare Specific Functionality
@@ -282,7 +239,6 @@ public void prepareStorage(byte[] symetricKey, UserKeyRecord record) {
         synchronized (lock) {
             this.userKeyRecordUUID = record.getUuid();
             this.key = symetricKey;
-            pool.init();
             if (userDatabase != null && userDatabase.isOpen()) {
                 userDatabase.close();
             }
@@ -305,7 +261,7 @@ public void startSession(User user, UserKeyRecord record) {
 
                 //Let anyone who is listening know!
                 Intent i = new Intent("org.commcare.dalvik.api.action.session.login");
-                this.sendBroadcast(i);
+                sendBroadcastFailSafe(this, i, null);
             }
 
             this.user = user;
@@ -346,12 +302,18 @@ private void timeToExpireSession() {
         // timeout then wrap-up the process.
         if (logoutStartedAt != -1 &&
                 currentTime > (logoutStartedAt + LOGOUT_TIMEOUT)) {
+            Logger.log(LogTypes.TYPE_USER,
+                    "Crossed threshold to save form session state during scheduled session expiration. Passed " + (
+                            currentTime - logoutStartedAt) + "ms");
             // Try and grab the logout lock, aborting if synchronization is in
             // progress.
             if (!CommCareSessionService.sessionAliveLock.tryLock()) {
+                Logger.log(LogTypes.TYPE_USER,
+                        "Unabled to get session lock during scheduled session expiration");
                 return;
             }
             try {
+                Logger.log(LogTypes.TYPE_USER, "Expiring user session forcefully due to session timeout");
                 CommCareApplication.instance().expireUserSession();
             } finally {
                 CommCareSessionService.sessionAliveLock.unlock();
@@ -367,10 +329,13 @@ private void timeToExpireSession() {
             // Try and grab the logout lock, aborting if synchronization is in
             // progress.
             if (!CommCareSessionService.sessionAliveLock.tryLock()) {
+                Logger.log(LogTypes.TYPE_USER,
+                        "Unabled to get session lock during scheduled session expiration");
                 return;
             }
 
             try {
+                Logger.log(LogTypes.TYPE_USER, "Expiring user session due to session timeout");
                 saveFormAndCloseSession();
             } finally {
                 CommCareSessionService.sessionAliveLock.unlock();
@@ -395,7 +360,7 @@ private void saveFormAndCloseSession() {
         // save form progress, if any
         synchronized (lock) {
             if (formSaver != null) {
-                formSaver.formSaveCallback(() -> {
+                formSaver.formSaveCallback(true, false, () -> {
                     CommCareApplication.instance().expireUserSession();
                 });
             } else {
@@ -414,7 +379,7 @@ public void proceedWithSavedSessionIfNeeded(Runnable callback) {
             if (formSaver != null) {
                 Toast.makeText(CommCareApplication.instance(),
                         "Suspending existing form entry session...", Toast.LENGTH_LONG).show();
-                formSaver.formSaveCallback(callback);
+                formSaver.formSaveCallback(true, false, callback);
                 formSaver = null;
                 return;
             }
@@ -458,7 +423,7 @@ public void closeServiceResources() {
 
             // Let anyone who is listening know!
             Intent i = new Intent("org.commcare.dalvik.api.action.session.logout");
-            this.sendBroadcast(i);
+            sendBroadcastFailSafe(this, i, null);
 
             Logger.log(LogTypes.TYPE_MAINTENANCE, "Logging out service login");
 
@@ -477,8 +442,6 @@ public void closeServiceResources() {
                 maintenanceTimer.cancel();
             }
             logoutStartedAt = -1;
-
-            pool.expire();
             endHeartbeatLifecycle();
         }
     }
@@ -547,20 +510,20 @@ public void beginSubmissionProcess(int totalItems) {
                 callable.setAction("android.intent.action.MAIN");
                 callable.addCategory("android.intent.category.LAUNCHER");
 
-               // The PendingIntent to launch our activity if the user selects this notification
-               //TODO: Put something here that will, I dunno, cancel submission or something? Maybe show it live?
-               PendingIntent contentIntent;
+                // The PendingIntent to launch our activity if the user selects this notification
+                //TODO: Put something here that will, I dunno, cancel submission or something? Maybe show it live?
+                PendingIntent contentIntent;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
                     contentIntent = PendingIntent.getActivity(CommCareSessionService.this, 0, callable, PendingIntent.FLAG_IMMUTABLE);
                 else
-                    contentIntent = PendingIntent.getActivity(CommCareSessionService.this, 0, callable,0);
+                    contentIntent = PendingIntent.getActivity(CommCareSessionService.this, 0, callable, 0);
 
                 submissionNotification = new NotificationCompat.Builder(CommCareSessionService.this,
                         CommCareNoficationManager.NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID)
                         .setContentTitle(getString(notificationId))
                         .setContentInfo(getSubmittedFormCount(1, totalItems))
                         .setContentText("0b transmitted")
-                        .setSmallIcon(org.commcare.dalvik.R.drawable.notification)
+                        .setSmallIcon(org.commcare.dalvik.R.drawable.commcare_actionbar_logo)
                         .setContentIntent(contentIntent)
                         .setOngoing(true)
                         .setWhen(System.currentTimeMillis())
@@ -698,4 +661,52 @@ public void hideInAppUpdate() {
     public boolean shouldShowInAppUpdate() {
         return this.showInAppUpdate;
     }
+
+    public void extendUserSessionIfNeeded(){
+        long currentTime = new Date().getTime();
+
+        if (sessionExpireDate.getTime() < currentTime + SESSION_EXTENSION_TIME) {
+            sessionExpireDate.setTime(sessionExpireDate.getTime() + SESSION_EXTENSION_TIME);
+            sessionLength += SESSION_EXTENSION_TIME;
+
+            mNM.notify(NOTIFICATION, createSessionNotification());
+        }
+    }
+
+    private Notification createSessionNotification(){
+        //We always want this click to simply bring the live stack back to the top
+        Intent callable = new Intent(this, DispatchActivity.class);
+        callable.setAction("android.intent.action.MAIN");
+        callable.addCategory("android.intent.category.LAUNCHER");
+
+        int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
+        }
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, callable, pendingIntentFlags);
+
+        String notificationText;
+        if (AppUtils.getInstalledAppRecords().size() > 1) {
+            try {
+                notificationText = Localization.get("notification.logged.in",
+                        new String[]{Localization.get("app.display.name")});
+            } catch (NoLocalizedTextException e) {
+                notificationText = getString(NOTIFICATION);
+            }
+        } else {
+            notificationText = getString(NOTIFICATION);
+        }
+
+        // Set the icon, scrolling text and timestamp
+        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, CommCareNoficationManager.NOTIFICATION_CHANNEL_ERRORS_ID)
+                .setContentTitle(notificationText)
+                .setSmallIcon(R.drawable.commcare_actionbar_logo)
+                .setContentIntent(contentIntent);
+
+        if (user != null) {
+            String contentText = "Session Expires: " + DateFormat.format("MMM dd h:mmaa", sessionExpireDate);
+            notificationBuilder.setContentText(contentText);
+        }
+        return notificationBuilder.build();
+    }
 }
diff --git a/app/src/org/commcare/services/DataSyncCompleteBroadcastReceiver.java b/app/src/org/commcare/services/DataSyncCompleteBroadcastReceiver.java
new file mode 100644
index 0000000000..fa32bac4f7
--- /dev/null
+++ b/app/src/org/commcare/services/DataSyncCompleteBroadcastReceiver.java
@@ -0,0 +1,41 @@
+package org.commcare.services;
+
+import static org.commcare.activities.EntitySelectActivity.EXTRA_ENTITY_KEY;
+import static org.commcare.activities.HomeScreenBaseActivity.RESULT_RESTART;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import org.commcare.CommCareApplication;
+import org.commcare.activities.CommCareActivity;
+import org.commcare.activities.EntityDetailActivity;
+import org.commcare.models.AndroidSessionWrapper;
+import org.commcare.session.SessionFrame;
+
+public class DataSyncCompleteBroadcastReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        AndroidSessionWrapper asw = CommCareApplication.instance().getCurrentSessionWrapper();
+        CommCareActivity activity = (CommCareActivity) context;
+        Intent returnIntent = new Intent();
+        setSelectedEntity(activity, returnIntent);
+        activity.setResult(RESULT_RESTART, returnIntent);
+        activity.finish();
+    }
+
+    /**
+     * This is to be used when rebuilding the session to trigger the select detail logic
+     *
+     * @param activity
+     * @param returnIntent
+     */
+    private void setSelectedEntity(CommCareActivity activity, Intent returnIntent) {
+        if (activity instanceof EntityDetailActivity &&
+                activity.getIntent().hasExtra(SessionFrame.STATE_DATUM_VAL)) {
+            String selectedEntity = activity.getIntent().getStringExtra(SessionFrame.STATE_DATUM_VAL);
+            returnIntent.putExtra(EXTRA_ENTITY_KEY, selectedEntity);
+        }
+    }
+}
diff --git a/app/src/org/commcare/services/FCMMessageData.java b/app/src/org/commcare/services/FCMMessageData.java
new file mode 100644
index 0000000000..4bd9dac00e
--- /dev/null
+++ b/app/src/org/commcare/services/FCMMessageData.java
@@ -0,0 +1,93 @@
+package org.commcare.services;
+
+import org.javarosa.core.services.Logger;
+import org.javarosa.core.util.externalizable.DeserializationException;
+import org.javarosa.core.util.externalizable.ExtUtil;
+import org.javarosa.core.util.externalizable.Externalizable;
+import org.javarosa.core.util.externalizable.PrototypeFactory;
+import org.joda.time.DateTime;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * This class is to facilitate handling the FCM Message Data object. It should contain all the
+ * necessary checks and transformations
+ */
+public class FCMMessageData implements Externalizable{
+    private CommCareFirebaseMessagingService.ActionTypes action;
+    private String username;
+    private String domain;
+    private DateTime creationTime;
+
+    public FCMMessageData(Map<String, String> payloadData){
+        this.action = getActionType(payloadData.get("action"));
+        this.username = payloadData.get("username");
+        this.domain = payloadData.get("domain");
+        this.creationTime = convertISO8601ToDateTime(payloadData.get("created_at"));
+    }
+
+    public FCMMessageData(){}
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public DateTime getCreationTime() {
+        return creationTime;
+    }
+
+    public CommCareFirebaseMessagingService.ActionTypes getAction() {
+        return action;
+    }
+
+    private DateTime convertISO8601ToDateTime(String timeInISO8601) {
+        if (timeInISO8601 == null){
+            return new DateTime();
+        }
+        try {
+            return new DateTime(timeInISO8601);
+        } catch (Exception e) {
+            Logger.exception("Incorrect Date format, expected in ISO 8601: ", e);
+            return new DateTime();
+        }
+    }
+
+    private CommCareFirebaseMessagingService.ActionTypes getActionType(String action) {
+        if (action == null) {
+            return CommCareFirebaseMessagingService.ActionTypes.INVALID;
+        }
+
+        switch (action.toUpperCase()) {
+            case "SYNC" -> {
+                return CommCareFirebaseMessagingService.ActionTypes.SYNC;
+            }
+            default -> {
+                return CommCareFirebaseMessagingService.ActionTypes.INVALID;
+            }
+        }
+    }
+
+    @Override
+    public void readExternal(DataInputStream in, PrototypeFactory pf) throws IOException, DeserializationException {
+        action = CommCareFirebaseMessagingService.ActionTypes.valueOf(ExtUtil.readString(in));
+        username = ExtUtil.readString(in);
+        domain = ExtUtil.readString(in);
+        creationTime = new DateTime(ExtUtil.readLong(in));
+    }
+
+    @Override
+    public void writeExternal(DataOutputStream out) throws IOException {
+        ExtUtil.writeString(out, action.toString());
+        ExtUtil.writeString(out, username);
+        ExtUtil.writeString(out, domain);
+        ExtUtil.writeNumeric(out, creationTime.getMillis());
+    }
+}
+
diff --git a/app/src/org/commcare/services/PendingSyncAlertBroadcastReceiver.java b/app/src/org/commcare/services/PendingSyncAlertBroadcastReceiver.java
new file mode 100644
index 0000000000..d9befae0a0
--- /dev/null
+++ b/app/src/org/commcare/services/PendingSyncAlertBroadcastReceiver.java
@@ -0,0 +1,27 @@
+package org.commcare.services;
+
+import static org.commcare.sync.FirebaseMessagingDataSyncer.FCM_MESSAGE_DATA;
+import static org.commcare.sync.FirebaseMessagingDataSyncer.FCM_MESSAGE_DATA_KEY;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.commcare.activities.CommCareActivity;
+import org.commcare.utils.FirebaseMessagingUtil;
+
+public class PendingSyncAlertBroadcastReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        if (intent.hasExtra(FCM_MESSAGE_DATA_KEY)) {
+            Bundle b = intent.getBundleExtra(FCM_MESSAGE_DATA_KEY);
+            FCMMessageData fcmMessageData = FirebaseMessagingUtil.deserializeFCMMessageData(
+                    (String) b.getSerializable(FCM_MESSAGE_DATA));
+
+            ((CommCareActivity) context).alertPendingSync(fcmMessageData);
+        }
+
+    }
+}
diff --git a/app/src/org/commcare/sync/ExternalDataUpdateHelper.java b/app/src/org/commcare/sync/ExternalDataUpdateHelper.java
index 04f2990f61..3d8c97f601 100644
--- a/app/src/org/commcare/sync/ExternalDataUpdateHelper.java
+++ b/app/src/org/commcare/sync/ExternalDataUpdateHelper.java
@@ -1,30 +1,62 @@
 package org.commcare.sync;
 
+import static org.commcare.utils.Permissions.COMMCARE_CASE_READ_PERMISSION;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 
+import org.commcare.CommCareApplication;
+import org.javarosa.core.services.Logger;
+
 import java.util.ArrayList;
 
 import javax.annotation.Nullable;
 
 public class ExternalDataUpdateHelper {
 
+    public static final String COMMCARE_DATA_UPDATE_ACTION = "org.commcare.dalvik.api.action.data.update";
+
     /**
      * Broadcasts data update to external apps
      * @param c context to send the broadcast with
      * @param updatedCases list of cases updated or created in the update
      */
-    public static void broadcastDataUpdate(Context c, @Nullable ArrayList<String> updatedCases) {
-        Intent i = new Intent("org.commcare.dalvik.api.action.data.update");
+    public static void broadcastDataUpdate(Context c,
+                                           @Nullable ArrayList<String> updatedCases) {
+        Intent i = new Intent(COMMCARE_DATA_UPDATE_ACTION);
         if (updatedCases != null) {
             i.putStringArrayListExtra("cases", updatedCases);
         }
-        c.sendBroadcast(i, "org.commcare.dalvik.provider.cases.read");
+
+        // This is to be used by extenal apps to run any user based filtering
+        if (CommCareApplication.instance().getSession().isActive()) {
+            i.putExtra("cc-logged-in-user-id", CommCareApplication.instance().getCurrentUserId());
+        }
+        sendBroadcastFailSafe(c, i, COMMCARE_CASE_READ_PERMISSION);
 
         // send explicit broadcast to CommCare Reminders App
         i.setComponent(new ComponentName("org.commcare.dalvik.reminders",
                 "org.commcare.dalvik.reminders.CommCareReceiver"));
-        c.sendBroadcast(i);
+        sendBroadcastFailSafe(c, i, null);
+
+        // Broadcast to CommCare, there is the option to handle the permission required by the
+        // broadcast above
+        broadcastDataUpdateToCommCare(c);
+    }
+
+    // send explicit broadcast to CommCare
+    private static void broadcastDataUpdateToCommCare(Context c){
+        Intent i = new Intent(COMMCARE_DATA_UPDATE_ACTION);
+        i.setPackage(c.getPackageName());
+        sendBroadcastFailSafe(c, i, null);
+    }
+
+    public static void sendBroadcastFailSafe(Context context, Intent intent, @Nullable String receiverPermission) {
+        try {
+            context.sendBroadcast(intent, receiverPermission);
+        } catch (Exception e) {
+            Logger.exception("Exception when sending a broadcast with intent " + intent, e);
+        }
     }
 }
diff --git a/app/src/org/commcare/sync/FirebaseMessagingDataSyncer.java b/app/src/org/commcare/sync/FirebaseMessagingDataSyncer.java
new file mode 100644
index 0000000000..03392b3bd5
--- /dev/null
+++ b/app/src/org/commcare/sync/FirebaseMessagingDataSyncer.java
@@ -0,0 +1,292 @@
+package org.commcare.sync;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.widget.Toast;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.work.Constraints;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
+import androidx.work.WorkInfo;
+import androidx.work.WorkManager;
+
+import org.commcare.CommCareApplication;
+import org.commcare.preferences.HiddenPreferences;
+import org.commcare.preferences.ServerUrls;
+import org.commcare.services.CommCareSessionService;
+import org.commcare.services.FCMMessageData;
+import org.commcare.tasks.DataPullTask;
+import org.commcare.tasks.ResultAndError;
+import org.commcare.tasks.templates.CommCareTask;
+import org.commcare.tasks.templates.CommCareTaskConnector;
+import org.commcare.util.LogTypes;
+import org.commcare.utils.FirebaseMessagingUtil;
+import org.commcare.utils.SyncDetailCalculations;
+import org.commcare.views.dialogs.PinnedNotificationWithProgress;
+import org.javarosa.core.model.User;
+import org.javarosa.core.services.Logger;
+import org.javarosa.core.services.locale.Localization;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FirebaseMessagingDataSyncer implements CommCareTaskConnector {
+
+    public static final String PENGING_SYNC_ALERT_ACTION = "org.commcare.dalvik.action.PENDING_SYNC_ALERT";
+    public static final String FCM_MESSAGE_DATA = "fcm_message_data";
+    public static final String FCM_MESSAGE_DATA_KEY = "fcm_message_data_key";
+    private static final String SYNC_FORM_SUBMISSION_REQUEST = "background_sync_form_submission_request";
+    private Context context;
+
+    public FirebaseMessagingDataSyncer(Context context) {
+        this.context = context;
+    }
+
+    private CommCareTask currentTask = null;
+    private PinnedNotificationWithProgress<DataPullTask.PullTaskResult> mPinnedNotificationProgress = null;
+
+    /**
+     * If we land here is because there is a data payload and the action there is to sync
+     * 1) Check if there is an active session.
+     * - If yes, this will lead to further steps to attempt to trigger a sync
+     * - If not, a sync will be scheduled after the next successful login
+     * 2) Ensure that the sync is only triggered for the intended 'recipient' of the message
+     */
+    public void syncData(FCMMessageData fcmMessageData) {
+        if (!CommCareApplication.isSessionActive()) {
+            //  There is no active session at the moment, proceed accordingly
+            HiddenPreferences.setPendingSyncRequest(fcmMessageData);
+            return;
+        }
+        // Retrieve the current User
+        User user = CommCareApplication.instance().getSession().getLoggedInUser();
+
+        // Check if the recipient of the message matches the current logged in user
+        if (checkUserAndDomain(user, fcmMessageData.getUsername(), fcmMessageData.getDomain())) {
+
+            if (fcmMessageData.getCreationTime().getMillis() < SyncDetailCalculations.getLastSyncTime(user.getUsername())) {
+                // A sync occurred since the sync request was triggered
+                return;
+            }
+            // The sync is triggered after any unsent forms are uploaded to HQ
+            uploadForms(user, fcmMessageData);
+        } else {
+            // Username and Domain don't match the current user OR payload data doesn't include username
+            // and/or domain - Action: no actual, just log issue, no need to inform the user
+            Logger.log(LogTypes.TYPE_FCM, "Ignored sync request for " + fcmMessageData.getUsername() + "@" + fcmMessageData.getDomain());
+        }
+    }
+
+    private void uploadForms(User user, FCMMessageData fcmMessageData) {
+        Constraints constraints = new Constraints.Builder()
+                .setRequiredNetworkType(NetworkType.CONNECTED)
+                .build();
+
+        OneTimeWorkRequest formSubmissionRequest = new OneTimeWorkRequest.Builder(FormSubmissionWorker.class)
+                .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                .setConstraints(constraints)
+                .build();
+
+        WorkManager wm = WorkManager.getInstance(CommCareApplication.instance());
+        wm.enqueueUniqueWork(SYNC_FORM_SUBMISSION_REQUEST, ExistingWorkPolicy.KEEP,
+                formSubmissionRequest);
+        LiveData<WorkInfo> workInfoLiveData = wm.getWorkInfoByIdLiveData(formSubmissionRequest.getId());
+
+        // observeForever cannot be called from a background thread
+        new Handler(Looper.getMainLooper()).post(() ->
+                workInfoLiveData.observeForever(new Observer<>() {
+                    @Override
+                    public void onChanged(WorkInfo workInfo) {
+                        if (workInfo != null && workInfo.getState().isFinished()) {
+                            if (workInfo.getState() == WorkInfo.State.SUCCEEDED) {
+                                // Attempt to trigger the sync if the user is currently in a sync
+                                // safe activity
+                                if (CommCareApplication.instance().isBackgroundSyncSafe()){
+                                    triggerBackgroundSync(user);
+                                }
+                                else {
+                                    informUserAboutPendingSync(fcmMessageData);
+                                }
+                            }
+                            workInfoLiveData.removeObserver(this);
+                        }
+                    }
+                }));
+    }
+
+    /**
+     * At this point, all the conditions are in place to trigger the sync: there is an active session
+     * and the current user has been successfully verified. The principle here is to:
+     * 1) Assess the current state of the app and decide the appropriate course of action, options
+     * being:
+     * - Trigger a background sync and block the user from accessing features that are not safe
+     * during a sync: logouts, syncs and form entries
+     * - Schedule the sync right after the form submission
+     */
+    private void triggerBackgroundSync(User user) {
+
+        DataPullTask<Object> dataPullTask = new DataPullTask<Object>(user.getUsername(),
+                user.getCachedPwd(),
+                user.getUniqueId(),
+                ServerUrls.getDataServerKey(),
+                context,
+                true) {
+
+            @Override
+            protected void onPreExecute() {
+                super.onPreExecute();
+            }
+
+            @Override
+            protected void deliverResult(Object receiver,
+                                         ResultAndError<PullTaskResult> resultAndErrorMessage) {
+                PullTaskResult result = resultAndErrorMessage.data;
+                if (result != DataPullTask.PullTaskResult.DOWNLOAD_SUCCESS) {
+                    Toast.makeText(context, Localization.get("background.sync.fail"), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                Toast.makeText(context, Localization.get("sync.success.synced"), Toast.LENGTH_LONG).show();
+            }
+
+            @Override
+            protected void deliverUpdate(Object receiver, Integer... update) {
+                handleProgress(update);
+            }
+
+            @Override
+            protected void deliverError(Object receiver, Exception e) {
+                Logger.log(LogTypes.TYPE_FCM, Localization.get("background.sync.fail")+": " + e.getMessage());
+            }
+
+            @Override
+            protected void onPostExecute(ResultAndError<PullTaskResult> resultAndErrorMessage) {
+                super.onPostExecute(resultAndErrorMessage);
+                if (mPinnedNotificationProgress != null) {
+                    mPinnedNotificationProgress.handleTaskCompletion(resultAndErrorMessage);
+                }
+            }
+        };
+        dataPullTask.connect(this);
+        dataPullTask.execute();
+    }
+
+    private boolean checkUserAndDomain(User user, String payloadUsername, String payloadDomain) {
+        if(payloadUsername != null && payloadDomain != null){
+            String loggedInUsername = user.getUsername();
+            String userDomain = HiddenPreferences.getUserDomainWithoutServerUrl();
+            return payloadUsername.equalsIgnoreCase(loggedInUsername) && payloadDomain.equalsIgnoreCase(userDomain);
+        }
+        return false;
+    }
+
+    // This method is responsible for informing the User about a pending sync and scheduling
+    // a sync for when it's safe
+    private void informUserAboutPendingSync(FCMMessageData fcmMessageData) {
+        Intent intent = new Intent(PENGING_SYNC_ALERT_ACTION);
+        Bundle b = new Bundle();
+        b.putSerializable(FCM_MESSAGE_DATA, FirebaseMessagingUtil.serializeFCMMessageData(fcmMessageData));
+        intent.putExtra(FCM_MESSAGE_DATA_KEY, b);
+        ExternalDataUpdateHelper.sendBroadcastFailSafe(context, intent, null);
+    }
+
+    @Override
+    public void connectTask(CommCareTask task) {
+        this.currentTask = task;
+    }
+
+    @Override
+    public void startBlockingForTask(int id) {
+        // In case a background sync is already ongoing, we ignore the new request silently
+        if (CommCareSessionService.sessionAliveLock.isLocked()) {
+            currentTask.cancel(true);
+        }
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            mPinnedNotificationProgress = new PinnedNotificationWithProgress(context,
+                    "sync.communicating.title", "sync.progress.starting", -1);
+        }
+    }
+
+    @Override
+    public void stopBlockingForTask(int id) {
+    }
+
+    @Override
+    public void taskCancelled() {
+
+    }
+
+    @Override
+    public Object getReceiver() {
+        return null;
+    }
+
+    @Override
+    public void startTaskTransition() {
+
+    }
+
+    @Override
+    public void stopTaskTransition(int taskId) {
+    }
+
+    @Override
+    public void hideTaskCancelButton() {
+
+    }
+
+    private void handleProgress(Integer... update) {
+        if (mPinnedNotificationProgress != null) {
+            int status = update[0];
+            List<Integer> progressBarUpdate = new ArrayList<>();
+
+            switch (status) {
+                case DataPullTask.PROGRESS_STARTED:
+                    mPinnedNotificationProgress.setProgressText("sync.progress.purge");
+                    break;
+                case DataPullTask.PROGRESS_CLEANED:
+                    mPinnedNotificationProgress.setProgressText("sync.progress.authing");
+                    break;
+                case DataPullTask.PROGRESS_AUTHED:
+                    mPinnedNotificationProgress.setProgressText("sync.progress.downloading");
+                    if (update[1] == 1)
+                        return;
+                    break;
+                case DataPullTask.PROGRESS_DOWNLOADING:
+                    mPinnedNotificationProgress.setTitleText("sync.downloading.title");
+                    mPinnedNotificationProgress.setProgressText("sync.process.downloading.progress");
+                    progressBarUpdate.add(0);
+                    progressBarUpdate.add(-1);
+                    break;
+                case DataPullTask.PROGRESS_DOWNLOADING_COMPLETE:
+                    mPinnedNotificationProgress.setProgressText("sync.process.downloading.progress");
+                    progressBarUpdate.add(100);
+                    progressBarUpdate.add(-1);
+                    break;
+                case DataPullTask.PROGRESS_PROCESSING:
+                    mPinnedNotificationProgress.setTitleText("sync.processing.title");
+                    mPinnedNotificationProgress.setProgressText("sync.progress");
+                    progressBarUpdate.add(update[1]);
+                    progressBarUpdate.add(update[2]);
+                    break;
+                case DataPullTask.PROGRESS_SERVER_PROCESSING:
+                    mPinnedNotificationProgress.setTitleText("sync.waiting.title");
+                    mPinnedNotificationProgress.setProgressText("sync.progress");
+                    progressBarUpdate.add(update[1]);
+                    progressBarUpdate.add(update[2]);
+                    break;
+
+                default:
+                    return;
+            }
+            mPinnedNotificationProgress.handleTaskUpdate(progressBarUpdate.toArray(new Integer[]{}));
+        }
+    }
+}
diff --git a/app/src/org/commcare/sync/FormSubmissionWorker.kt b/app/src/org/commcare/sync/FormSubmissionWorker.kt
index a185caa490..cfdf0496a3 100644
--- a/app/src/org/commcare/sync/FormSubmissionWorker.kt
+++ b/app/src/org/commcare/sync/FormSubmissionWorker.kt
@@ -1,10 +1,14 @@
 package org.commcare.sync
 
 import android.content.Context
+import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
+import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import org.commcare.CommCareApplication
+import org.commcare.CommCareNoficationManager
+import org.commcare.dalvik.R
 import org.commcare.tasks.DataSubmissionListener
 import org.commcare.utils.FormUploadResult
 
@@ -14,15 +18,29 @@ class FormSubmissionWorker(appContext: Context, workerParams: WorkerParameters)
     private lateinit var formSubmissionHelper: FormSubmissionHelper
 
     private val formSubmissionListeners = java.util.ArrayList<DataSubmissionListener>()
+    private val context = appContext
+    private val notificationId = R.string.submission_notification_title
 
     companion object {
         const val Progress = "progress"
     }
 
+    override suspend fun getForegroundInfo(): ForegroundInfo {
+        var notificationBuilder = NotificationCompat.Builder(context,
+            CommCareNoficationManager.NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID)
+            .setContentTitle(context.getString(notificationId))
+            .setSmallIcon(R.drawable.commcare_actionbar_logo)
+
+        return ForegroundInfo(notificationId, notificationBuilder.build())
+    }
+
     override suspend fun doWork(): Result {
         formSubmissionHelper = FormSubmissionHelper(applicationContext, this, this)
-        formSubmissionListeners.add(CommCareApplication.instance().getSession().getListenerForSubmissionNotification())
-
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            formSubmissionListeners.add(
+                    CommCareApplication.instance().getSession().getListenerForSubmissionNotification()
+            )
+        }
         val result = formSubmissionHelper.uploadForms()
 
         return when (result) {
diff --git a/app/src/org/commcare/tasks/DataPullTask.java b/app/src/org/commcare/tasks/DataPullTask.java
index 6b070daf1b..e0eb215089 100644
--- a/app/src/org/commcare/tasks/DataPullTask.java
+++ b/app/src/org/commcare/tasks/DataPullTask.java
@@ -1,8 +1,6 @@
 package org.commcare.tasks;
 
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import androidx.core.util.Pair;
 
 import net.sqlcipher.database.SQLiteDatabase;
@@ -22,10 +20,9 @@
 import org.commcare.engine.cases.CaseUtils;
 import org.commcare.google.services.analytics.AnalyticsParamValue;
 import org.commcare.interfaces.CommcareRequestEndpoints;
-import org.commcare.models.FormRecordProcessor;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.models.database.user.models.AndroidCaseIndexTable;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.models.encryption.ByteEncrypter;
 import org.commcare.modern.models.RecordTooLargeException;
 import org.commcare.network.DataPullRequester;
@@ -83,7 +80,7 @@ public abstract class DataPullTask<R>
     public static final int PROGRESS_STARTED = 0;
     public static final int PROGRESS_CLEANED = 1;
     public static final int PROGRESS_AUTHED = 2;
-    private static final int PROGRESS_DONE = 4;
+    public static final int PROGRESS_DONE = 4;
     public static final int PROGRESS_RECOVERY_NEEDED = 8;
     public static final int PROGRESS_RECOVERY_STARTED = 16;
     private static final int PROGRESS_RECOVERY_FAIL_SAFE = 32;
@@ -100,10 +97,12 @@ public abstract class DataPullTask<R>
     private boolean loginNeeded;
     private UserKeyRecord ukrForLogin;
     private boolean wasKeyLoggedIn;
+    private boolean skipFixtures;
 
     public DataPullTask(String username, String password, String userId,
                         String server, Context context, DataPullRequester dataPullRequester,
-                        boolean blockRemoteKeyManagement) {
+                        boolean blockRemoteKeyManagement, boolean skipFixtures) {
+        this.skipFixtures = skipFixtures;
         this.server = server;
         this.username = username;
         this.password = password;
@@ -113,14 +112,13 @@ public DataPullTask(String username, String password, String userId,
         this.requestor = dataPullRequester.getHttpGenerator(username, password, userId);
         this.asyncRestoreHelper = CommCareApplication.instance().getAsyncRestoreHelper(this);
         this.blockRemoteKeyManagement = blockRemoteKeyManagement;
-
         TAG = DataPullTask.class.getSimpleName();
     }
 
     public DataPullTask(String username, String password, String userId,
-                        String server, Context context) {
+                        String server, Context context, boolean skipFixtures) {
         this(username, password, userId, server, context, CommCareApplication.instance().getDataPullRequester(),
-                false);
+                false, skipFixtures);
     }
 
     // TODO PLM: once this task is refactored into manageable components, it should use the
@@ -154,7 +152,6 @@ private ResultAndError<PullTaskResult> doTaskBackgroundHelper() {
 
         publishProgress(PROGRESS_STARTED);
         HiddenPreferences.setPostUpdateSyncNeeded(false);
-        Logger.log(LogTypes.TYPE_USER, "Starting Sync");
         determineIfLoginNeeded();
 
         AndroidTransactionParserFactory factory = getTransactionParserFactory();
@@ -311,7 +308,7 @@ private ResultAndError<PullTaskResult> makeRequestAndHandleResponse(AndroidTrans
             throws IOException, UnknownSyncError {
 
         RemoteDataPullResponse pullResponse =
-                dataPullRequester.makeDataPullRequest(this, requestor, server, !loginNeeded);
+                dataPullRequester.makeDataPullRequest(this, requestor, server, !loginNeeded, skipFixtures);
 
         int responseCode = pullResponse.responseCode;
         Logger.log(LogTypes.TYPE_USER,
@@ -460,6 +457,10 @@ private void onSuccessfulSync() {
 
         Logger.log(LogTypes.TYPE_USER, "User Sync Successful|" + username);
         updateCurrentUser(password);
+
+        // Disable pending background syncs
+        HiddenPreferences.clearPendingSyncRequest(username);
+
         this.publishProgress(PROGRESS_DONE);
     }
 
@@ -514,7 +515,7 @@ private Pair<Integer, String> recover(CommcareRequestEndpoints requestor, Androi
         try {
             // Make a new request without all of the flags
             RemoteDataPullResponse pullResponse =
-                    dataPullRequester.makeDataPullRequest(this, requestor, server, false);
+                    dataPullRequester.makeDataPullRequest(this, requestor, server, false, skipFixtures);
 
             if (!(pullResponse.responseCode >= 200 && pullResponse.responseCode < 300)) {
                 return new Pair<>(PROGRESS_RECOVERY_FAIL_SAFE,
@@ -577,7 +578,7 @@ private void wipeStorageForFourTwelveSync(SQLiteDatabase userDb) {
         SqlStorage.wipeTableWithoutCommit(userDb, ACase.STORAGE_KEY);
         SqlStorage.wipeTableWithoutCommit(userDb, Ledger.STORAGE_KEY);
         SqlStorage.wipeTableWithoutCommit(userDb, AndroidCaseIndexTable.TABLE_NAME);
-        EntityStorageCache.wipeCacheForCurrentAppWithoutCommit(userDb);
+        CommCareEntityStorageCache.wipeCacheForCurrentAppWithoutCommit(userDb);
     }
 
     private void updateCurrentUser(String password) {
diff --git a/app/src/org/commcare/tasks/EntityLoaderHelper.kt b/app/src/org/commcare/tasks/EntityLoaderHelper.kt
new file mode 100644
index 0000000000..d4b40aeaf7
--- /dev/null
+++ b/app/src/org/commcare/tasks/EntityLoaderHelper.kt
@@ -0,0 +1,79 @@
+package org.commcare.tasks
+
+import android.util.Pair
+import io.reactivex.functions.Cancellable
+import org.commcare.activities.EntitySelectActivity
+import org.commcare.cases.entity.AsyncNodeEntityFactory
+import org.commcare.cases.entity.Entity
+import org.commcare.cases.entity.EntityStorageCache
+import org.commcare.cases.entity.NodeEntityFactory
+import org.commcare.models.database.user.models.CommCareEntityStorageCache
+import org.commcare.preferences.DeveloperPreferences
+import org.commcare.suite.model.Detail
+import org.javarosa.core.model.condition.EvaluationContext
+import org.javarosa.core.model.instance.TreeReference
+
+class EntityLoaderHelper(
+    detail: Detail,
+    evalCtx: EvaluationContext
+) : Cancellable {
+
+    var focusTargetIndex: Int = -1
+    private var stopLoading: Boolean = false
+    var factory: NodeEntityFactory
+
+    init {
+        evalCtx.addFunctionHandler(EntitySelectActivity.getHereFunctionHandler())
+        if (detail.useAsyncStrategy()) {
+            val entityStorageCache: EntityStorageCache = CommCareEntityStorageCache("case")
+            factory = AsyncNodeEntityFactory(detail, evalCtx, entityStorageCache)
+        } else {
+            factory = NodeEntityFactory(detail, evalCtx)
+            if (DeveloperPreferences.collectAndDisplayEntityTraces()) {
+                factory.activateDebugTraceOutput()
+            }
+        }
+    }
+
+    /**
+     * Loads and prepares a list of entities derived from the given nodeset
+     */
+    fun loadEntities(nodeset: TreeReference): Pair<List<Entity<TreeReference>>, List<TreeReference>>? {
+        val references = factory.expandReferenceList(nodeset)
+        val entities = loadEntitiesWithReferences(references)
+        entities?.let {
+            factory.prepareEntities(entities)
+            factory.printAndClearTraces("build")
+            return Pair<List<Entity<TreeReference>>, List<TreeReference>>(entities, references)
+        }
+        return null
+    }
+
+
+    /**
+     * Loads a list of entities corresponding to the given references
+     */
+    private fun loadEntitiesWithReferences(references: List<TreeReference>): MutableList<Entity<TreeReference>>? {
+        val entities: MutableList<Entity<TreeReference>> = ArrayList()
+        focusTargetIndex = -1
+        var indexInFullList = 0
+        for (ref in references) {
+            if (stopLoading) {
+                return null
+            }
+            val e = factory.getEntity(ref)
+            if (e != null) {
+                entities.add(e)
+                if (e.shouldReceiveFocus()) {
+                    focusTargetIndex = indexInFullList
+                }
+                indexInFullList++
+            }
+        }
+        return entities
+    }
+
+    override fun cancel() {
+        stopLoading = true
+    }
+}
diff --git a/app/src/org/commcare/tasks/EntityLoaderTask.java b/app/src/org/commcare/tasks/EntityLoaderTask.java
index 13cbc6c3ca..2f4b6ac58d 100644
--- a/app/src/org/commcare/tasks/EntityLoaderTask.java
+++ b/app/src/org/commcare/tasks/EntityLoaderTask.java
@@ -2,22 +2,16 @@
 
 import android.util.Pair;
 
-import org.commcare.activities.EntitySelectActivity;
 import org.commcare.android.logging.ForceCloseLogger;
 import org.commcare.cases.entity.Entity;
-import org.commcare.cases.entity.NodeEntityFactory;
 import org.commcare.logging.XPathErrorLogger;
-import org.commcare.models.AsyncNodeEntityFactory;
-import org.commcare.preferences.DeveloperPreferences;
 import org.commcare.suite.model.Detail;
 import org.commcare.tasks.templates.ManagedAsyncTask;
-import org.commcare.util.LogTypes;
 import org.javarosa.core.model.condition.EvaluationContext;
 import org.javarosa.core.model.instance.TreeReference;
 import org.javarosa.core.services.Logger;
 import org.javarosa.xpath.XPathException;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,52 +23,20 @@ public class EntityLoaderTask
     private final static Object lock = new Object();
     private static EntityLoaderTask pendingTask = null;
 
-    private final NodeEntityFactory factory;
     private EntityLoaderListener listener;
+    private final EntityLoaderHelper entityLoaderHelper;
     private Exception mException = null;
-    private int focusTargetIndex;
 
     public EntityLoaderTask(Detail detail, EvaluationContext evalCtx) {
-        evalCtx.addFunctionHandler(EntitySelectActivity.getHereFunctionHandler());
-        if (detail.useAsyncStrategy()) {
-            this.factory = new AsyncNodeEntityFactory(detail, evalCtx);
-        } else {
-            this.factory = new NodeEntityFactory(detail, evalCtx);
-            if (DeveloperPreferences.collectAndDisplayEntityTraces()) {
-                this.factory.activateDebugTraceOutput();
-            }
-        }
+        entityLoaderHelper = new EntityLoaderHelper(detail, evalCtx);
     }
 
     @Override
     protected Pair<List<Entity<TreeReference>>, List<TreeReference>> doInBackground(TreeReference... nodeset) {
         try {
-            List<TreeReference> references = factory.expandReferenceList(nodeset[0]);
-
-            List<Entity<TreeReference>> full = new ArrayList<>();
-            focusTargetIndex = -1;
-            int indexInFullList = 0;
-            for (TreeReference ref : references) {
-                if (this.isCancelled()) {
-                    return null;
-                }
-
-                Entity<TreeReference> e = factory.getEntity(ref);
-                if (e != null) {
-                    full.add(e);
-                    if (e.shouldReceiveFocus()) {
-                        focusTargetIndex = indexInFullList;
-                    }
-                    indexInFullList++;
-                }
-            }
-
-            factory.prepareEntities(full);
-            factory.printAndClearTraces("build");
-            return new Pair<>(full, references);
+            return entityLoaderHelper.loadEntities(nodeset[0]);
         } catch (XPathException xe) {
             XPathErrorLogger.INSTANCE.logErrorToCurrentApp(xe);
-            xe.printStackTrace();
             Logger.exception("Error during EntityLoaderTask: " + ForceCloseLogger.getStackTrace(xe), xe);
             mException = xe;
             return null;
@@ -97,8 +59,12 @@ protected void onPostExecute(Pair<List<Entity<TreeReference>>, List<TreeReferenc
                         return;
                     }
 
-                    listener.deliverLoadResult(result.first, result.second, factory, focusTargetIndex);
+                    if (result == null) {
+                        return;
+                    }
 
+                    listener.deliverLoadResult(result.first, result.second, entityLoaderHelper.getFactory(),
+                            entityLoaderHelper.getFocusTargetIndex());
                     return;
                 }
             }
@@ -140,4 +106,10 @@ public void attachListener(EntityLoaderListener listener) {
         this.listener = listener;
         listener.attachLoader(this);
     }
+
+    @Override
+    protected void onCancelled() {
+        super.onCancelled();
+        entityLoaderHelper.cancel();
+    }
 }
diff --git a/app/src/org/commcare/tasks/FormLoaderTask.java b/app/src/org/commcare/tasks/FormLoaderTask.java
index 694250d600..be04c28072 100644
--- a/app/src/org/commcare/tasks/FormLoaderTask.java
+++ b/app/src/org/commcare/tasks/FormLoaderTask.java
@@ -1,7 +1,6 @@
 package org.commcare.tasks;
 
 import android.content.Context;
-import android.os.Environment;
 import android.util.Log;
 
 import org.commcare.CommCareApplication;
@@ -14,7 +13,7 @@
 import org.commcare.logging.UserCausedRuntimeException;
 import org.commcare.logging.XPathErrorLogger;
 import org.commcare.logic.AndroidFormController;
-import org.commcare.logic.FileReferenceFactory;
+import org.commcare.models.database.InterruptedFormState;
 import org.commcare.models.encryption.EncryptionIO;
 import org.commcare.preferences.DeveloperPreferences;
 import org.commcare.tasks.templates.CommCareTask;
@@ -23,6 +22,7 @@
 import org.commcare.utils.GlobalConstants;
 import org.javarosa.core.io.StreamsUtil;
 import org.javarosa.core.model.FormDef;
+import org.javarosa.core.model.FormIndex;
 import org.javarosa.core.model.instance.InstanceInitializationFactory;
 import org.javarosa.core.model.instance.TreeElement;
 import org.javarosa.core.model.instance.TreeReference;
@@ -64,6 +64,7 @@ public abstract class FormLoaderTask<R> extends CommCareTask<Integer, String, Fo
     private final SecretKeySpec mSymetricKey;
     private final boolean mReadOnly;
     private final boolean recordEntrySession;
+    private final InterruptedFormState savedFormSession;
 
     private EvaluationTraceReporter traceReporterForFullForm;
     private final boolean profilingEnabledForFormLoad = false;
@@ -76,7 +77,7 @@ public abstract class FormLoaderTask<R> extends CommCareTask<Integer, String, Fo
     public static final int FORM_LOADER_TASK_ID = 16;
 
     public FormLoaderTask(SecretKeySpec symetricKey, boolean readOnly,
-                          boolean recordEntrySession, String formRecordPath, R activity) {
+                          boolean recordEntrySession, String formRecordPath, R activity, InterruptedFormState savedFormSession) {
         this.mSymetricKey = symetricKey;
         this.mReadOnly = readOnly;
         this.activity = activity;
@@ -84,6 +85,7 @@ public FormLoaderTask(SecretKeySpec symetricKey, boolean readOnly,
         this.recordEntrySession = recordEntrySession;
         this.formRecordPath = formRecordPath;
         TAG = FormLoaderTask.class.getSimpleName();
+        this.savedFormSession = savedFormSession;
     }
 
     /**
@@ -137,7 +139,7 @@ protected FECWrapper doTaskBackground(Integer... formDefId) {
 
         setupFormMedia(formDefRecord.getMediaPath());
 
-        AndroidFormController formController = new AndroidFormController(fec, mReadOnly);
+        AndroidFormController formController = new AndroidFormController(fec, mReadOnly, savedFormSession);
 
         data = new FECWrapper(formController);
         return data;
diff --git a/app/src/org/commcare/tasks/LogSubmissionTask.java b/app/src/org/commcare/tasks/LogSubmissionTask.java
index 22748b21b8..64ac182c6a 100644
--- a/app/src/org/commcare/tasks/LogSubmissionTask.java
+++ b/app/src/org/commcare/tasks/LogSubmissionTask.java
@@ -33,6 +33,7 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.annotation.Nullable;
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
@@ -90,6 +91,7 @@ public String getCategory() {
         }
     }
 
+    @Nullable
     private final DataSubmissionListener listener;
     private final String submissionUrl;
     private final boolean forceLogs;
@@ -102,6 +104,10 @@ public LogSubmissionTask(DataSubmissionListener listener,
         this.forceLogs = forceLogs;
     }
 
+    public LogSubmissionTask(String submissionUrl, boolean forceLogs) {
+        this(null, submissionUrl, forceLogs);
+    }
+
     public static String getSubmissionUrl(SharedPreferences appPreferences) {
         return appPreferences.getString(ServerUrls.PREFS_LOG_POST_URL_KEY,
                 appPreferences.getString(ServerUrls.PREFS_SUBMISSION_URL_KEY, null));
@@ -178,7 +184,7 @@ private static boolean serializeLogs(SqlStorage<DeviceReportRecord> storage) {
             DeviceReportWriter reporter;
             try {
                 //Create a report writer
-                    reporter = new DeviceReportWriter(record);
+                reporter = new DeviceReportWriter(record);
             } catch (IOException e) {
                 //TODO: Bad local file (almost certainly). Throw a better message!
                 e.printStackTrace();
@@ -259,7 +265,7 @@ private void submitReports(SqlStorage<DeviceReportRecord> storage,
     }
 
     private static LogSubmitOutcomes submitDeviceReportRecord(DeviceReportRecord slr, String submissionUrl,
-                                                    DataSubmissionListener listener, int index, boolean forceLogs) {
+                                                              DataSubmissionListener listener, int index, boolean forceLogs) {
         //Get our file pointer
         File f = new File(slr.getFilePath());
 
@@ -268,7 +274,9 @@ private static LogSubmitOutcomes submitDeviceReportRecord(DeviceReportRecord slr
             return LogSubmitOutcomes.SUBMITTED;
         }
 
-        listener.startSubmission(index, f.length());
+        if (listener != null) {
+            listener.startSubmission(index, f.length());
+        }
 
         CommcareRequestGenerator generator;
         User user;
@@ -347,7 +355,6 @@ private LogSubmitOutcomes checkSubmissionResult(int numberOfLogsToSubmit,
         if (submittedSuccesfully.size() == numberOfLogsToSubmit) {
             return LogSubmitOutcomes.SUBMITTED;
         } else {
-            Logger.log(LogTypes.TYPE_MAINTENANCE, numberOfLogsToSubmit - submittedSuccesfully.size() + " logs remain on phone.");
             //Some remain unsent
             return LogSubmitOutcomes.SERIALIZED;
         }
@@ -389,22 +396,25 @@ public void endSubmissionProcess(boolean success) {
     @Override
     protected void onProgressUpdate(Long... values) {
         super.onProgressUpdate(values);
-
-        if (values[0] == LogSubmissionTask.SUBMISSION_BEGIN) {
-            listener.beginSubmissionProcess(values[1].intValue());
-        } else if (values[0] == LogSubmissionTask.SUBMISSION_START) {
-            listener.startSubmission(values[1].intValue(), values[2]);
-        } else if (values[0] == LogSubmissionTask.SUBMISSION_NOTIFY) {
-            listener.notifyProgress(values[1].intValue(), values[2]);
-        } else if (values[0] == LogSubmissionTask.SUBMISSION_DONE) {
-            listener.endSubmissionProcess(true);
+        if (listener != null) {
+            if (values[0] == LogSubmissionTask.SUBMISSION_BEGIN) {
+                listener.beginSubmissionProcess(values[1].intValue());
+            } else if (values[0] == LogSubmissionTask.SUBMISSION_START) {
+                listener.startSubmission(values[1].intValue(), values[2]);
+            } else if (values[0] == LogSubmissionTask.SUBMISSION_NOTIFY) {
+                listener.notifyProgress(values[1].intValue(), values[2]);
+            } else if (values[0] == LogSubmissionTask.SUBMISSION_DONE) {
+                listener.endSubmissionProcess(true);
+            }
         }
     }
 
     @Override
     protected void onPostExecute(LogSubmitOutcomes result) {
         super.onPostExecute(result);
-        listener.endSubmissionProcess(LogSubmitOutcomes.SUBMITTED.equals(result));
+        if (listener != null) {
+            listener.endSubmissionProcess(LogSubmitOutcomes.SUBMITTED.equals(result));
+        }
         if (result != LogSubmitOutcomes.SUBMITTED) {
             CommCareApplication.notificationManager().reportNotificationMessage(NotificationMessageFactory.message(result));
         } else {
diff --git a/app/src/org/commcare/tasks/ModernHttpTask.java b/app/src/org/commcare/tasks/ModernHttpTask.java
index 20d87623da..229abdc78b 100644
--- a/app/src/org/commcare/tasks/ModernHttpTask.java
+++ b/app/src/org/commcare/tasks/ModernHttpTask.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
 import org.commcare.CommCareApplication;
@@ -29,8 +28,7 @@
  * @author Phillip Mates (pmates@dimagi.com)
  */
 public class ModernHttpTask
-        extends CommCareTask<Void, Void, Void, HttpResponseProcessor>
-        implements ResponseStreamAccessor {
+        extends CommCareTask<Void, Void, Void, HttpResponseProcessor> {
 
     public static final int SIMPLE_HTTP_TASK_ID = 11;
 
@@ -62,7 +60,7 @@ public ModernHttpTask(Context context, String url, Multimap<String, String> para
                 method,
                 authInfo,
                 null,
-                method.equals(HTTPMethod.GET) ? true : false);
+                method.equals(HTTPMethod.GET));
     }
 
     @Override
@@ -75,6 +73,7 @@ protected Void doTaskBackground(Void... params) {
         } catch (IOException e) {
             mException = e;
         }
+
         return null;
     }
 
@@ -89,7 +88,17 @@ protected void deliverResult(HttpResponseProcessor httpResponseProcessor,
             ModernHttpRequester.processResponse(
                     httpResponseProcessor,
                     mResponse.code(),
-                    this);
+                    new ResponseStreamAccessor() {
+                        @Override
+                        public InputStream getResponseStream() {
+                            return responseDataStream;
+                        }
+
+                        @Override
+                        public String getApiVersion() {
+                            return requester.getApiVersion();
+                        }
+                    });
         }
     }
 
@@ -102,9 +111,4 @@ protected void deliverUpdate(HttpResponseProcessor httpResponseProcessor,
     protected void deliverError(HttpResponseProcessor httpResponseProcessor,
                                 Exception e) {
     }
-
-    @Override
-    public InputStream getResponseStream() {
-        return responseDataStream;
-    }
 }
diff --git a/app/src/org/commcare/tasks/ResourceEngineTask.java b/app/src/org/commcare/tasks/ResourceEngineTask.java
index df7132e0d1..043e6b8299 100644
--- a/app/src/org/commcare/tasks/ResourceEngineTask.java
+++ b/app/src/org/commcare/tasks/ResourceEngineTask.java
@@ -145,7 +145,6 @@ protected AppInstallStatus doTaskBackground(String... profileRefs) {
 
             return AppInstallStatus.Installed;
         } catch (Exception e) {
-            e.printStackTrace();
             ResourceInstallUtils.logInstallError(e,
                     "Unknown error ocurred during install|");
             return AppInstallStatus.UnknownFailure;
diff --git a/app/src/org/commcare/tasks/SaveToDiskTask.java b/app/src/org/commcare/tasks/SaveToDiskTask.java
index 64091c4a58..b7e2186168 100644
--- a/app/src/org/commcare/tasks/SaveToDiskTask.java
+++ b/app/src/org/commcare/tasks/SaveToDiskTask.java
@@ -1,7 +1,5 @@
 package org.commcare.tasks;
 
-import android.util.Log;
-
 import org.commcare.CommCareApplication;
 import org.commcare.activities.FormEntryActivity;
 import org.commcare.activities.components.ImageCaptureProcessing;
@@ -55,11 +53,13 @@ public class SaveToDiskTask extends
     private final String mFormRecordPath;
 
     private final SecretKeySpec symetricKey;
+    private final boolean userTriggered;
 
     public enum SaveStatus {
         SAVED_COMPLETE,
         SAVED_INCOMPLETE,
         SAVE_ERROR,
+        SAVE_UNRECOVERABLE_ERROR,
         INVALID_ANSWER,
         SAVED_AND_EXIT
     }
@@ -68,7 +68,7 @@ public enum SaveStatus {
 
     public SaveToDiskTask(int formRecordId, int formDefId, String formRecordPath, Boolean saveAndExit, Boolean markCompleted,
                           String updatedName,
-                          SecretKeySpec symetricKey, boolean headless) {
+                          SecretKeySpec symetricKey, boolean headless, boolean userTriggered) {
         TAG = SaveToDiskTask.class.getSimpleName();
 
         mFormRecordId = formRecordId;
@@ -78,7 +78,7 @@ public SaveToDiskTask(int formRecordId, int formDefId, String formRecordPath, Bo
         mRecordName = updatedName;
         this.symetricKey = symetricKey;
         mFormRecordPath = formRecordPath;
-
+        this.userTriggered = userTriggered;
         if (headless) {
             this.taskId = -1;
 
@@ -102,7 +102,7 @@ protected ResultAndError<SaveStatus> doTaskBackground(Void... nothing) {
         } catch (XPathException xpe) {
             String cleanedMessage = "An error in your form prevented it from saving: \n" +
                     xpe.getMessage();
-            return new ResultAndError<>(SaveStatus.SAVE_ERROR, cleanedMessage);
+            return new ResultAndError<>(SaveStatus.SAVE_UNRECOVERABLE_ERROR, cleanedMessage);
         }
 
         FormEntryActivity.mFormController.postProcessInstance();
@@ -111,15 +111,15 @@ protected ResultAndError<SaveStatus> doTaskBackground(Void... nothing) {
             exportData(mMarkCompleted);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
-            return new ResultAndError<>(SaveStatus.SAVE_ERROR,
+            return new ResultAndError<>(SaveStatus.SAVE_UNRECOVERABLE_ERROR,
                     "Something is blocking acesss to the submission file in " + mFormRecordPath);
         } catch (XFormSerializer.UnsupportedUnicodeSurrogatesException e) {
             Logger.log(LogTypes.TYPE_ERROR_CONFIG_STRUCTURE, "Form contains invalid data encoding\n\n" + ForceCloseLogger.getStackTrace(e));
-            return new ResultAndError<>(SaveStatus.SAVE_ERROR,
+            return new ResultAndError<>(SaveStatus.SAVE_UNRECOVERABLE_ERROR,
                     Localization.get("form.entry.save.invalid.unicode", e.getMessage()));
         } catch (IOException e) {
             Logger.log(LogTypes.TYPE_ERROR_STORAGE, "I/O Error when serializing form\n\n" + ForceCloseLogger.getStackTrace(e));
-            return new ResultAndError<>(SaveStatus.SAVE_ERROR,
+            return new ResultAndError<>(SaveStatus.SAVE_UNRECOVERABLE_ERROR,
                     "Unable to write xml to " + mFormRecordPath);
         } catch (FormInstanceTransactionException e) {
             e.printStackTrace();
@@ -128,7 +128,7 @@ protected ResultAndError<SaveStatus> doTaskBackground(Void... nothing) {
             // Likely a user level issue, so send error to HQ as a app build error
             XPathErrorLogger.INSTANCE.logErrorToCurrentApp(cleanedMessage);
 
-            return new ResultAndError<>(SaveStatus.SAVE_ERROR, cleanedMessage);
+            return new ResultAndError<>(SaveStatus.SAVE_UNRECOVERABLE_ERROR, cleanedMessage);
         }
 
         if (mMarkCompleted) {
@@ -272,9 +272,9 @@ protected void onPostExecute(ResultAndError<SaveStatus> result) {
         synchronized (this) {
             if (mSavedListener != null) {
                 if (result == null) {
-                    mSavedListener.savingComplete(SaveStatus.SAVE_ERROR, "Unknown Error");
+                    mSavedListener.savingComplete(SaveStatus.SAVE_ERROR, "Unknown Error", exitAfterSave, userTriggered);
                 } else {
-                    mSavedListener.savingComplete(result.data, result.errorMessage);
+                    mSavedListener.savingComplete(result.data, result.errorMessage, exitAfterSave, userTriggered);
                 }
             }
         }
diff --git a/app/src/org/commcare/tasks/templates/CommCareTask.java b/app/src/org/commcare/tasks/templates/CommCareTask.java
index 3bf2aebb9f..4f0998643d 100755
--- a/app/src/org/commcare/tasks/templates/CommCareTask.java
+++ b/app/src/org/commcare/tasks/templates/CommCareTask.java
@@ -39,17 +39,15 @@ protected final Result doInBackground(Params... params) {
         try {
             return doTaskBackground(params);
         } catch (Exception e) {
-            Logger.log(TAG, "Error during task execution: " + e.getMessage());
-            e.printStackTrace();
-
             if (!(e instanceof UserCausedRuntimeException)) {
                 // Report crashes we know weren't caused by user misconfiguration
-                CrashUtil.reportException(e);
+                Logger.exception("Error during task execution: ", e);
+            } else {
+                Logger.log(TAG, "Error during task execution: " + e.getMessage());
             }
 
             // Save error for reporting during post-execute
             unknownError = e;
-
             return null;
         }
     }
diff --git a/app/src/org/commcare/update/UpdateHelper.java b/app/src/org/commcare/update/UpdateHelper.java
index 67c2658832..7fe01bc477 100644
--- a/app/src/org/commcare/update/UpdateHelper.java
+++ b/app/src/org/commcare/update/UpdateHelper.java
@@ -18,7 +18,6 @@
 import org.commcare.resources.ResourceInstallContext;
 import org.commcare.resources.model.InstallCancelled;
 import org.commcare.resources.model.InstallCancelledException;
-import org.commcare.resources.model.InstallRequestSource;
 import org.commcare.resources.model.InvalidResourceException;
 import org.commcare.resources.model.Resource;
 import org.commcare.resources.model.ResourceTable;
@@ -84,7 +83,7 @@ public static UpdateHelper getNewInstance(boolean autoUpdate, UpdateProgressList
 
     // Main UpdateHelper function for staging updates
     public ResultAndError<AppInstallStatus> update(String profileRef, ResourceInstallContext resourceInstallContext) {
-        setupUpdate(profileRef);
+        setupUpdate(profileRef, resourceInstallContext);
 
         try {
             return new ResultAndError<>(stageUpdate(profileRef, resourceInstallContext));
@@ -123,10 +122,10 @@ public ResultAndError<AppInstallStatus> update(String profileRef, ResourceInstal
         }
     }
 
-    private void setupUpdate(String profileRef) {
+    private void setupUpdate(String profileRef, ResourceInstallContext resourceInstallContext) {
         ResourceInstallUtils.recordUpdateAttemptTime(mApp);
         Logger.log(LogTypes.TYPE_RESOURCES,
-                "Beginning install attempt for profile " + profileRef);
+                "Beginning install attempt as " + resourceInstallContext.getInstallRequestSource() + " for profile " + profileRef);
 
         if (isAutoUpdate) {
             ResourceInstallUtils.recordAutoUpdateStart(mApp);
@@ -150,7 +149,7 @@ private AppInstallStatus stageUpdate(String profileRef, ResourceInstallContext r
 
         AppInstallStatus result = mResourceManager.checkAndPrepareUpgradeResources(profileRefWithParams, mAuthority, resourceInstallContext);
 
-        if (result == AppInstallStatus.UpdateStaged) {
+        if (result == AppInstallStatus.UpdateStaged || result == AppInstallStatus.UpToDate) {
             RequestStats.markSuccess(resourceInstallContext.getInstallRequestSource());
         }
 
@@ -225,12 +224,13 @@ public void incrementProgress(int complete, int total) {
      * @param ctx For launching notification and localizing text.
      */
     public void startPinnedNotification(Context ctx) {
-        mPinnedNotificationProgress =
-                new PinnedNotificationWithProgress(ctx, "updates.pinned.download",
-                        "updates.pinned.progress", R.drawable.update_download_icon);
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            mPinnedNotificationProgress =
+                    new PinnedNotificationWithProgress(ctx, "updates.pinned.download",
+                            "updates.pinned.progress", R.drawable.update_download_icon);
+        }
     }
 
-
     public void updateNotification(Integer... values) {
         if (mPinnedNotificationProgress != null) {
             mPinnedNotificationProgress.handleTaskUpdate(values);
@@ -238,7 +238,6 @@ public void updateNotification(Integer... values) {
     }
 
     public void OnUpdateCancelled() {
-
         if (mPinnedNotificationProgress != null) {
             mPinnedNotificationProgress.handleTaskCancellation();
         }
diff --git a/app/src/org/commcare/update/UpdateWorker.kt b/app/src/org/commcare/update/UpdateWorker.kt
index b5c1a58be1..5bc74b8d93 100644
--- a/app/src/org/commcare/update/UpdateWorker.kt
+++ b/app/src/org/commcare/update/UpdateWorker.kt
@@ -14,6 +14,7 @@ import org.commcare.resources.ResourceInstallContext
 import org.commcare.resources.model.InstallCancelled
 import org.commcare.resources.model.InstallRequestSource
 import org.commcare.tasks.ResultAndError
+import org.javarosa.core.services.Logger
 
 /**
  * Used to stage an update for the seated app in the background. Does not perform
@@ -42,29 +43,32 @@ class UpdateWorker(appContext: Context, workerParams: WorkerParameters)
             job.invokeOnCompletion { exception: Throwable? ->
                 when {
                     exception is CancellationException -> handleUpdateResult(ResultAndError(AppInstallStatus.Cancelled))
-                    exception != null -> handleUpdateResult(ResultAndError(AppInstallStatus.UnknownFailure))
+                    exception != null -> {
+                        Logger.exception("Unknown error while app update", exception)
+                        Result.failure()
+                    }
                 }
             }
 
             job.await()
         }
-
     }
 
     private fun doUpdateWork(): Result {
-        val updateResult: ResultAndError<AppInstallStatus>
-
-        // skip if - An update task is already running | no app is seated | user session is not active
-        if (UpdateTask.getRunningInstance() == null &&
-                CommCareApplication.instance().currentApp != null &&
-                CommCareApplication.instance().session.isActive) {
-
-            updateHelper.startPinnedNotification(CommCareApplication.instance())
-            updateResult = updateHelper.update(ResourceInstallUtils.getDefaultProfileRef(),
-                    ResourceInstallContext(InstallRequestSource.BACKGROUND_UPDATE))
-        } else {
+        if (UpdateTask.getRunningInstance() != null) {
+            // there is already an update running, lets just skip this run
             return Result.success()
         }
+
+        if (CommCareApplication.instance().currentApp == null) {
+            // we need a seated app to update
+            return Result.failure()
+        }
+
+        updateHelper.startPinnedNotification(CommCareApplication.instance())
+        val updateResult: ResultAndError<AppInstallStatus> = updateHelper.update(
+            ResourceInstallUtils.getDefaultProfileRef(),
+            ResourceInstallContext(InstallRequestSource.BACKGROUND_UPDATE))
         return handleUpdateResult(updateResult)
     }
 
@@ -78,6 +82,7 @@ class UpdateWorker(appContext: Context, workerParams: WorkerParameters)
 
         return when {
             updateResult.data == AppInstallStatus.UpdateStaged -> Result.success()
+            updateResult.data == AppInstallStatus.UpToDate -> Result.success()
             updateResult.data.shouldRetryUpdate() -> Result.retry()
             else -> Result.failure()
         }
@@ -99,4 +104,4 @@ class UpdateWorker(appContext: Context, workerParams: WorkerParameters)
         return isStopped
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/org/commcare/utils/AndroidXUtils.java b/app/src/org/commcare/utils/AndroidXUtils.java
new file mode 100644
index 0000000000..783a757aa6
--- /dev/null
+++ b/app/src/org/commcare/utils/AndroidXUtils.java
@@ -0,0 +1,11 @@
+package org.commcare.utils;
+
+import androidx.core.util.Pair;
+
+import org.jetbrains.annotations.Nullable;
+
+public class AndroidXUtils {
+    public static Pair<Long, Long> toPair(Long first, Long second) {
+        return new Pair<>(first, second);
+    }
+}
diff --git a/app/src/org/commcare/utils/CommCareUtil.java b/app/src/org/commcare/utils/CommCareUtil.java
index a0b26b144f..297a1d8632 100644
--- a/app/src/org/commcare/utils/CommCareUtil.java
+++ b/app/src/org/commcare/utils/CommCareUtil.java
@@ -92,10 +92,15 @@ public static void triggerLogSubmission(Context c, boolean forceLogs) {
     }
 
     public static void executeLogSubmission(String url, boolean forceLogs) {
-        LogSubmissionTask reportSubmitter =
-                new LogSubmissionTask(CommCareApplication.instance().getSession().getListenerForSubmissionNotification(R.string.submission_logs_title),
-                        url,
-                        forceLogs);
+        LogSubmissionTask reportSubmitter;
+        if (CommCareApplication.notificationManager().areNotificationsEnabled()) {
+            reportSubmitter = new LogSubmissionTask(
+                    CommCareApplication.instance().getSession()
+                            .getListenerForSubmissionNotification(R.string.submission_logs_title), url,
+                    forceLogs);
+        } else {
+            reportSubmitter = new LogSubmissionTask(url, forceLogs);
+        }
         // Execute on a true multithreaded chain, since this is an asynchronous process
         reportSubmitter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
diff --git a/app/src/org/commcare/utils/DateRangeUtils.java b/app/src/org/commcare/utils/DateRangeUtils.java
deleted file mode 100644
index dd61f93e39..0000000000
--- a/app/src/org/commcare/utils/DateRangeUtils.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.commcare.utils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import javax.annotation.Nullable;
-
-import androidx.core.util.Pair;
-
-/**
- * Utility functions for DateRangePicker widget
- */
-public class DateRangeUtils {
-
-    // Changing this will require changing this format on ES end as well
-    public static final String DATE_RANGE_ANSWER_PREFIX = "__range__";
-    public static final String DATE_RANGE_ANSWER_DELIMITER = "__";
-    public static final String DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER = " to ";
-    private static final String DATE_FORMAT = "yyyy-MM-dd";
-
-    /**
-     * @param humanReadableDateRange human readable fomat for date range as 'startDate to endDate'
-     * @return a Pair of start time and end time that can be supplied to MaterialDatePicker to set a date range,
-     * @throws ParseException if the given humanReadableDateRange is not in 'yyyy-mm-dd to yyyy-mm-dd' format
-     */
-    @Nullable
-    public static Pair<Long, Long> parseHumanReadableDate(String humanReadableDateRange) throws ParseException {
-        if (humanReadableDateRange.contains(DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER)) {
-            String[] humanReadableDateRangeSplit = humanReadableDateRange.split(DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER);
-            if (humanReadableDateRangeSplit.length == 2) {
-                SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.US);
-                Date startDate = sdf.parse(humanReadableDateRangeSplit[0]);
-                Date endDate = sdf.parse(humanReadableDateRangeSplit[1]);
-                return new Pair<>(getTimeFromDateOffsettingTz(startDate), getTimeFromDateOffsettingTz(endDate));
-            }
-        }
-        throw new ParseException("Argument " + humanReadableDateRange + " should be formatted as 'yyyy-mm-dd to yyyy-mm-dd'", 0);
-    }
-
-    private static Long getTimeFromDateOffsettingTz(Date date) {
-        return date.getTime() - date.getTimezoneOffset() * 60 * 1000;
-    }
-
-    /**
-     * Formats __range__startDate__endDate as 'startDate to EndDate'
-     *
-     * @param dateRangeAnswer A date range value in form of '__range__startDate__endDate'
-     * @return human readable format 'startDate to EndDate' for given dateRangeAnswer
-     */
-    public static String getHumanReadableDateRange(String dateRangeAnswer) {
-        if (dateRangeAnswer != null && dateRangeAnswer.startsWith(DATE_RANGE_ANSWER_PREFIX)) {
-            String[] dateRangeSplit = dateRangeAnswer.split(DATE_RANGE_ANSWER_DELIMITER);
-            if (dateRangeSplit.length == 3) {
-                return getHumanReadableDateRange(dateRangeSplit[2], dateRangeSplit[3]);
-            }
-        }
-        return dateRangeAnswer;
-    }
-
-
-    // Formats as 'startDate to endDate'
-    public static String getHumanReadableDateRange(String startDate, String endDate) {
-        return startDate + DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER + endDate;
-    }
-
-    // Formats as '__range__startDate__endDate'
-    public static String formatDateRangeAnswer(String startDate, String endDate) {
-        return DATE_RANGE_ANSWER_PREFIX + startDate + DATE_RANGE_ANSWER_DELIMITER + endDate;
-    }
-
-    // Convers given time as yyyy-mm-dd
-    public static String getDateFromTime(Long time) {
-        return new SimpleDateFormat(DATE_FORMAT, Locale.US).format(new Date(time));
-    }
-}
diff --git a/app/src/org/commcare/utils/FirebaseMessagingUtil.java b/app/src/org/commcare/utils/FirebaseMessagingUtil.java
index a37bf4a017..5b41940339 100644
--- a/app/src/org/commcare/utils/FirebaseMessagingUtil.java
+++ b/app/src/org/commcare/utils/FirebaseMessagingUtil.java
@@ -1,6 +1,7 @@
 package org.commcare.utils;
 
 import android.content.SharedPreferences;
+import android.util.Base64;
 
 import androidx.preference.PreferenceManager;
 
@@ -9,19 +10,13 @@
 
 import org.commcare.CommCareApplication;
 import org.commcare.dalvik.BuildConfig;
+import org.commcare.services.FCMMessageData;
 import org.javarosa.core.services.Logger;
 
 public class FirebaseMessagingUtil {
     public static final String FCM_TOKEN = "fcm_token";
     public static final String FCM_TOKEN_TIME = "fcm_token_time";
 
-    /**
-     * The domain name in the application profile file comes in the <domain>.commcarehq.org form,
-     * this is standard across the different HQ servers. This constant is to store that suffix and
-     * be used to remove it form the user domain name to match how the domain represented in the backend
-     */
-    public static final String USER_DOMAIN_SERVER_URL_SUFFIX = ".commcarehq.org";
-
     public static String getFCMToken() {
         return PreferenceManager
                 .getDefaultSharedPreferences(CommCareApplication.instance())
@@ -41,17 +36,6 @@ public static void updateFCMToken(String newToken) {
         sharedPreferences.edit().putLong(FCM_TOKEN_TIME,System.currentTimeMillis()).apply();
     }
 
-    public static String removeServerUrlFromUserDomain(String userDomain) {
-        if (userDomain == null){
-            return null;
-        }
-
-        if (userDomain.contains(USER_DOMAIN_SERVER_URL_SUFFIX)){
-            return userDomain.replace(USER_DOMAIN_SERVER_URL_SUFFIX, "");
-        }
-        return userDomain;
-    }
-
     public static void verifyToken() {
         // TODO: Enable FCM in debug mode
         if(!BuildConfig.DEBUG){
@@ -67,4 +51,18 @@ private static OnCompleteListener handleFCMTokenRetrieval(){
             }
         };
     }
+
+    public static String serializeFCMMessageData(FCMMessageData fcmMessageData){
+        byte[] serializedMessageData = SerializationUtil.serialize(fcmMessageData);
+        String base64EncodedMessageData = Base64.encodeToString(serializedMessageData, Base64.DEFAULT);
+        return base64EncodedMessageData;
+    }
+
+    public static FCMMessageData deserializeFCMMessageData(String base64EncodedSerializedFCMMessageData){
+        if (base64EncodedSerializedFCMMessageData != null) {
+            byte [] serializedMessageData = Base64.decode(base64EncodedSerializedFCMMessageData, Base64.DEFAULT);
+            return SerializationUtil.deserialize(serializedMessageData, FCMMessageData.class);
+        }
+        return null;
+    }
 }
diff --git a/app/src/org/commcare/utils/FormUploadUtil.java b/app/src/org/commcare/utils/FormUploadUtil.java
index e358b81b94..f0d97ab02d 100644
--- a/app/src/org/commcare/utils/FormUploadUtil.java
+++ b/app/src/org/commcare/utils/FormUploadUtil.java
@@ -361,10 +361,14 @@ private static boolean buildMultipartEntity(List<MultipartBody.Part> parts,
                 }
             }
         }
-        Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Attempted to add "
-                + numAttachmentsInInstanceFolder + " attachments to submission entity");
-        Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Successfully added "
-                + numAttachmentsSuccessfullyAdded + " attachments to submission entity");
+        if (numAttachmentsInInstanceFolder > 0) {
+            Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Attempted to add "
+                    + numAttachmentsInInstanceFolder + " attachments to submission entity");
+        }
+        if (numAttachmentsSuccessfullyAdded > 0) {
+            Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Successfully added "
+                    + numAttachmentsSuccessfullyAdded + " attachments to submission entity");
+        }
         return true;
     }
 
diff --git a/app/src/org/commcare/utils/MediaUtil.java b/app/src/org/commcare/utils/MediaUtil.java
index 0ecf489edf..ce3763c94a 100644
--- a/app/src/org/commcare/utils/MediaUtil.java
+++ b/app/src/org/commcare/utils/MediaUtil.java
@@ -4,6 +4,8 @@
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.media.AudioManager;
+import android.os.Build;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pair;
@@ -11,8 +13,6 @@
 
 import org.commcare.CommCareApplication;
 import org.commcare.engine.references.JavaFileReference;
-import org.commcare.google.services.analytics.AnalyticsParamValue;
-import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.util.LogTypes;
 import org.javarosa.core.reference.InvalidReferenceException;
@@ -27,6 +27,7 @@
 import java.security.NoSuchAlgorithmException;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 /**
  * @author ctsims
@@ -506,4 +507,10 @@ private static Pair<Bitmap, Boolean> performSafeScaleDown(String imageFilepath,
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    public static boolean isRecordingActive(Context context){
+        return ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE))
+                .getActiveRecordingConfigurations().size() > 0;
+    }
+
 }
diff --git a/app/src/org/commcare/utils/NotificationUtil.java b/app/src/org/commcare/utils/NotificationUtil.java
new file mode 100644
index 0000000000..afbdc1f957
--- /dev/null
+++ b/app/src/org/commcare/utils/NotificationUtil.java
@@ -0,0 +1,48 @@
+package org.commcare.utils;
+
+import static android.content.Context.NOTIFICATION_SERVICE;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+
+import androidx.core.app.NotificationCompat;
+
+import org.commcare.activities.DispatchActivity;
+import org.commcare.dalvik.R;
+
+/**
+ * Set of methods to post notifications to the user.
+ *
+ * @author avazirna
+ */
+public class NotificationUtil {
+    public static void showNotification(Context context, String notificationChannel, int notificationId,
+                                        String notificationTitle, String notificationText, Intent actionIntent) {
+
+        int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
+        }
+        PendingIntent contentIntent =
+                PendingIntent.getActivity(context, 0, actionIntent, pendingIntentFlags);
+
+        NotificationCompat.Builder notification =
+                new NotificationCompat.Builder(context, notificationChannel)
+                        .setContentTitle(notificationTitle)
+                        .setContentText(notificationText)
+                        .setContentIntent(contentIntent)
+                        .setSmallIcon(R.drawable.commcare_actionbar_logo)
+                        .setPriority(NotificationCompat.PRIORITY_HIGH)
+                        .setWhen(System.currentTimeMillis());
+        ((NotificationManager) context.getSystemService(NOTIFICATION_SERVICE))
+                .notify(notificationId, notification.build());
+    }
+
+    public static void cancelNotification(Context context, int notificationId) {
+        ((NotificationManager) context.getSystemService(NOTIFICATION_SERVICE))
+                .cancel(notificationId);
+    }
+}
diff --git a/app/src/org/commcare/utils/Permissions.java b/app/src/org/commcare/utils/Permissions.java
index 91a4cdb839..bf8c4fb680 100644
--- a/app/src/org/commcare/utils/Permissions.java
+++ b/app/src/org/commcare/utils/Permissions.java
@@ -4,6 +4,7 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 
+import org.commcare.dalvik.BuildConfig;
 import org.commcare.interfaces.RuntimePermissionRequester;
 import org.commcare.views.dialogs.CommCareAlertDialog;
 import org.commcare.views.dialogs.DialogCreationHelpers;
@@ -13,6 +14,10 @@
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Acquire Android permissions needed by CommCare.
  *
@@ -20,6 +25,7 @@
  */
 public class Permissions {
     public final static int ALL_PERMISSIONS_REQUEST = 1;
+    public static final String COMMCARE_CASE_READ_PERMISSION = BuildConfig.APPLICATION_ID + ".provider.cases.read";
 
     /**
      * Ask for Android permissions needed by the app all at once.  This goes
@@ -89,21 +95,39 @@ public static boolean shouldShowPermissionRationale(AppCompatActivity activity,
      * @return Permissions needed for _normal_ CommCare functionality
      */
     public static String[] getAppPermissions() {
-        return new String[]{Manifest.permission.READ_PHONE_STATE,
+        List<String> appPermissions = new ArrayList<>(Arrays.asList(new String[]{
+                Manifest.permission.READ_PHONE_STATE,
                 Manifest.permission.CALL_PHONE,
                 Manifest.permission.ACCESS_FINE_LOCATION,
                 Manifest.permission.ACCESS_COARSE_LOCATION,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.RECORD_AUDIO
-        };
+                Manifest.permission.RECORD_AUDIO}));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            appPermissions.addAll(Arrays.asList(new String[]{
+                    Manifest.permission.READ_MEDIA_IMAGES,
+                    Manifest.permission.READ_MEDIA_AUDIO,
+                    Manifest.permission.READ_MEDIA_VIDEO,
+                    Manifest.permission.POST_NOTIFICATIONS}));
+        } else {
+            appPermissions.addAll(Arrays.asList(new String[]{
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                    Manifest.permission.READ_EXTERNAL_STORAGE}));
+        }
+        return appPermissions.toArray(new String[]{});
     }
 
     /**
      * @return Minimal set of permissions needed for CommCare to function
      */
     public static String[] getRequiredPerms() {
-        return new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return new String[]{
+                    Manifest.permission.READ_MEDIA_IMAGES,
+                    Manifest.permission.READ_MEDIA_AUDIO,
+                    Manifest.permission.READ_MEDIA_VIDEO};
+        }
+        return new String[]{
+                Manifest.permission.READ_EXTERNAL_STORAGE,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE};
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/org/commcare/utils/SerializationUtil.java b/app/src/org/commcare/utils/SerializationUtil.java
index b5d5c97155..a62561ecb5 100644
--- a/app/src/org/commcare/utils/SerializationUtil.java
+++ b/app/src/org/commcare/utils/SerializationUtil.java
@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Base64;
 
 import org.commcare.CommCareApplication;
 import org.javarosa.core.util.externalizable.DeserializationException;
@@ -44,6 +45,15 @@ public static <T extends Externalizable> T deserialize(byte[] bytes, Class<T> ty
     public static void serializeToIntent(Intent i, String name, Externalizable data) {
         i.putExtra(name, serialize(data));
     }
+
+    public static String serializeToString(Externalizable data) {
+        return Base64.encodeToString(serialize(data), Base64.DEFAULT);
+    }
+
+    public static <T extends Externalizable> T deserializeFromString(String data, Class<T> type) {
+        byte[] decodedData = Base64.decode(data, Base64.DEFAULT);
+        return deserialize(decodedData, type);
+    }
     
     public static <T extends Externalizable> T deserializeFromIntent(Intent i, String name, Class<T> type) {
         if(!i.hasExtra(name)) { return null;}
diff --git a/app/src/org/commcare/utils/SessionRegistrationHelper.java b/app/src/org/commcare/utils/SessionRegistrationHelper.java
index 2603e795e1..0cae9140fe 100755
--- a/app/src/org/commcare/utils/SessionRegistrationHelper.java
+++ b/app/src/org/commcare/utils/SessionRegistrationHelper.java
@@ -5,6 +5,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Build;
 import android.util.Log;
 
 import org.commcare.activities.DispatchActivity;
@@ -52,7 +54,11 @@ public static boolean handleSessionExpiration(AppCompatActivity activity) {
     }
 
     public static void registerSessionExpirationReceiver(AppCompatActivity activity) {
-        activity.registerReceiver(userSessionExpiredReceiver, expirationFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            activity.registerReceiver(userSessionExpiredReceiver, expirationFilter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            activity.registerReceiver(userSessionExpiredReceiver, expirationFilter);
+        }
     }
 
     /**
diff --git a/app/src/org/commcare/utils/StringUtils.java b/app/src/org/commcare/utils/StringUtils.java
index 4cba48eee5..6a21bb8751 100755
--- a/app/src/org/commcare/utils/StringUtils.java
+++ b/app/src/org/commcare/utils/StringUtils.java
@@ -1,65 +1,25 @@
 package org.commcare.utils;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
 import android.text.Spannable;
 
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+
+import org.commcare.modern.util.Pair;
+import org.javarosa.core.services.Logger;
 import org.javarosa.core.services.locale.Localization;
 import org.javarosa.core.util.NoLocalizedTextException;
 
-import java.text.Normalizer;
-import java.util.regex.Pattern;
-
-import androidx.annotation.NonNull;
-import androidx.collection.LruCache;
+import java.io.Serializable;
 
 /**
  * @author ctsims
  */
 public class StringUtils {
 
-    //TODO: Bro you can't just cache every fucking string ever.
-    private static LruCache<String, String> normalizationCache;
-
-    private static Pattern diacritics;
-
-    //TODO: Really not sure about this size. Also, the LRU probably isn't really the best model here
-    //since we'd _like_ for these caches to get cleaned up at _some_ point.
-    static final private int cacheSize = 100 * 1024;
-
-    /**
-     * @param input A non-null string
-     * @return a canonical version of the passed in string that is lower cased and has removed diacritical marks
-     * like accents.
-     */
-    @SuppressLint("NewApi")
-    public synchronized static String normalize(String input) {
-        if (normalizationCache == null) {
-            normalizationCache = new LruCache<>(cacheSize);
-
-            diacritics = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
-        }
-        String cachedString = normalizationCache.get(input);
-        if (cachedString != null) {
-            return cachedString;
-        }
-
-        //Initialized the normalized string (If we can, we'll use the Normalizer API on it)
-        String normalized = input;
-
-        //If we're above gingerbread we'll normalize this in NFD form 
-        //which helps a lot. Otherwise we won't be able to clear up some of those
-        //issues, but we can at least still eliminate diacritics.
-        normalized = Normalizer.normalize(input, Normalizer.Form.NFD);
-
-        String output = diacritics.matcher(normalized).replaceAll("").toLowerCase();
-
-        normalizationCache.put(input, output);
-
-        return output;
-    }
-
     public static String getStringRobust(Context c, int resId) {
         return getStringRobust(c, resId, "");
     }
diff --git a/app/src/org/commcare/utils/SyncDetailCalculations.java b/app/src/org/commcare/utils/SyncDetailCalculations.java
index 78ffe32b17..bc0e92a53d 100644
--- a/app/src/org/commcare/utils/SyncDetailCalculations.java
+++ b/app/src/org/commcare/utils/SyncDetailCalculations.java
@@ -11,10 +11,9 @@
 import org.commcare.activities.StandardHomeActivity;
 import org.commcare.adapters.HomeCardDisplayData;
 import org.commcare.adapters.SquareButtonViewHolder;
-import org.commcare.android.logging.ReportingUtils;
+import org.commcare.android.database.user.models.FormRecord;
 import org.commcare.dalvik.R;
 import org.commcare.models.database.SqlStorage;
-import org.commcare.android.database.user.models.FormRecord;
 import org.commcare.modern.util.Pair;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.util.LogTypes;
@@ -32,19 +31,23 @@
  * @author Phillip Mates (pmates@dimagi.com).
  */
 public class SyncDetailCalculations {
-    private final static String UNSENT_FORM_NUMBER_KEY = "unsent-number-limit";
-    private final static String UNSENT_FORM_TIME_KEY = "unsent-time-limit";
-    private final static String LAST_SYNC_KEY_BASE = "last-succesful-sync-";
+    private static final String UNSENT_FORM_NUMBER_KEY = "unsent-number-limit";
+    private static final String UNSENT_FORM_TIME_KEY = "unsent-time-limit";
+    private static final String LAST_SYNC_KEY_BASE = "last-succesful-sync-";
 
-    public static void updateSubText(final StandardHomeActivity activity,
-                                     SquareButtonViewHolder squareButtonViewHolder,
-                                     HomeCardDisplayData cardDisplayData, String notificationText) {
+    public static void updateSubText(
+            final StandardHomeActivity activity,
+            SquareButtonViewHolder squareButtonViewHolder,
+            HomeCardDisplayData cardDisplayData,
+            String notificationText) {
 
         int numUnsentForms = getNumUnsentForms();
         Pair<Long, String> lastSyncTimeAndMessage = getLastSyncTimeAndMessage();
 
-        Spannable syncIndicator = (activity.localize("home.unsent.forms.indicator",
-                new String[]{String.valueOf(numUnsentForms)}));
+        Spannable syncIndicator =
+                (activity.localize(
+                        "home.unsent.forms.indicator",
+                        new String[] {String.valueOf(numUnsentForms)}));
 
         String syncStatus = "";
 
@@ -54,7 +57,6 @@ public static void updateSubText(final StandardHomeActivity activity,
             syncStatus = lastSyncTimeAndMessage.second;
         }
 
-
         if (numUnsentForms != 0 || HiddenPreferences.shouldShowUnsentFormsWhenZero()) {
             if (!TextUtils.isEmpty(syncStatus)) {
                 syncStatus += "\n\n";
@@ -65,13 +67,16 @@ public static void updateSubText(final StandardHomeActivity activity,
         squareButtonViewHolder.subTextView.setText(syncStatus);
 
         setSyncSubtextColor(
-                squareButtonViewHolder.subTextView, numUnsentForms, lastSyncTimeAndMessage.first,
+                squareButtonViewHolder.subTextView,
+                numUnsentForms,
+                lastSyncTimeAndMessage.first,
                 activity.getResources().getColor(cardDisplayData.subTextColor),
                 activity.getResources().getColor(R.color.cc_dark_warm_accent_color));
     }
 
     public static int getNumUnsentForms() {
-        SqlStorage<FormRecord> formsStorage = CommCareApplication.instance().getUserStorage(FormRecord.class);
+        SqlStorage<FormRecord> formsStorage =
+                CommCareApplication.instance().getUserStorage(FormRecord.class);
         try {
             return StorageUtils.getUnsentRecordsForCurrentApp(formsStorage).length;
         } catch (SessionUnavailableException e) {
@@ -87,16 +92,24 @@ public static Pair<Long, String> getLastSyncTimeAndMessage() {
         if (lastSyncTime == 0) {
             syncTimeMessage = Localization.get("home.sync.message.last.never");
         } else {
-            syncTimeMessage = DateUtils.formatSameDayTime(lastSyncTime, new Date().getTime(), DateFormat.DEFAULT, DateFormat.DEFAULT);
+            syncTimeMessage =
+                    DateUtils.formatSameDayTime(
+                            lastSyncTime,
+                            new Date().getTime(),
+                            DateFormat.DEFAULT,
+                            DateFormat.DEFAULT);
         }
-        return new Pair<>(lastSyncTime, Localization.get("home.sync.message.last", new String[]{syncTimeMessage.toString()}));
+        return new Pair<>(
+                lastSyncTime,
+                Localization.get(
+                        "home.sync.message.last", new String[] {syncTimeMessage.toString()}));
     }
 
-
     /**
-     * @return The number of days since the user has last synced, as calculated by the difference
-     * between the current date and the date of the last sync. -1 if the user hasn't ever synced
-     * or if the last date of sync is unavailable
+     * Calculates the number of days synce the user last synced
+     *
+     * @return the difference between the current date and the date of the last sync. -1 if the user
+     *     hasn't ever synced or if the last date of sync is unavailable
      */
     public static int getDaysSinceLastSync() {
         try {
@@ -105,10 +118,11 @@ public static int getDaysSinceLastSync() {
                 return -1;
             }
             return getDaysBetweenJavaDatetimes(new Date(lastSync), new Date());
-        } catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
-            Logger.log(LogTypes.SOFT_ASSERT,"Error Generating Days since last sync: " +
-                    e.getMessage());
+            Logger.log(
+                    LogTypes.SOFT_ASSERT,
+                    "Error Generating Days since last sync: " + e.getMessage());
             return -1;
         }
     }
@@ -122,7 +136,8 @@ public static long getLastSyncTime() {
     }
 
     public static long getLastSyncTime(String username) {
-        SharedPreferences prefs = CommCareApplication.instance().getCurrentApp().getAppPreferences();
+        SharedPreferences prefs =
+                CommCareApplication.instance().getCurrentApp().getAppPreferences();
         return prefs.getLong(getLastSyncKey(username), 0);
     }
 
@@ -130,8 +145,12 @@ public static String getLastSyncKey(String username) {
         return LAST_SYNC_KEY_BASE + username;
     }
 
-    private static void setSyncSubtextColor(TextView subtext, int numUnsentForms, long lastSyncTime,
-                                            int normalColor, int warningColor) {
+    private static void setSyncSubtextColor(
+            TextView subtext,
+            int numUnsentForms,
+            long lastSyncTime,
+            int normalColor,
+            int warningColor) {
         if (isSyncStronglyNeeded(numUnsentForms, lastSyncTime)) {
             subtext.setTextColor(warningColor);
         } else {
@@ -140,24 +159,27 @@ private static void setSyncSubtextColor(TextView subtext, int numUnsentForms, lo
     }
 
     private static boolean isSyncStronglyNeeded(int numUnsentForms, long lastSyncTime) {
-        return unsentFormNumberLimitExceeded(numUnsentForms) ||
-                unsentFormTimeLimitExceeded(lastSyncTime);
+        return unsentFormNumberLimitExceeded(numUnsentForms)
+                || unsentFormTimeLimitExceeded(lastSyncTime);
     }
 
     private static boolean unsentFormNumberLimitExceeded(int numUnsentForms) {
-        SharedPreferences prefs = CommCareApplication.instance().getCurrentApp().getAppPreferences();
+        SharedPreferences prefs =
+                CommCareApplication.instance().getCurrentApp().getAppPreferences();
         int unsentFormNumberLimit = Integer.parseInt(prefs.getString(UNSENT_FORM_NUMBER_KEY, "5"));
         return numUnsentForms > unsentFormNumberLimit;
     }
 
     private static boolean unsentFormTimeLimitExceeded(long lastSyncTime) {
-        SharedPreferences prefs = CommCareApplication.instance().getCurrentApp().getAppPreferences();
-        int unsentFormTimeLimit = Integer.parseInt(prefs.getString(UNSENT_FORM_TIME_KEY, "5"));
+        SharedPreferences prefs =
+                CommCareApplication.instance().getCurrentApp().getAppPreferences();
+        double unsentFormTimeLimitInDays =
+                Double.parseDouble(prefs.getString(UNSENT_FORM_TIME_KEY, "5"));
+        long unsentFormTimeLimitInMsecs = (int) (unsentFormTimeLimitInDays * 24 * 60 * 60 * 1000);
 
         long now = new Date().getTime();
-        int secs_ago = (int)((lastSyncTime - now) / 1000);
-        int days_ago = secs_ago / 86400;
+        long msecsSinceLastSync = (now - lastSyncTime);
 
-        return (-days_ago) > unsentFormTimeLimit;
+        return msecsSinceLastSync > unsentFormTimeLimitInMsecs;
     }
 }
diff --git a/app/src/org/commcare/views/DotsHomeView.java b/app/src/org/commcare/views/DotsHomeView.java
index f62bf79905..05d53531b2 100755
--- a/app/src/org/commcare/views/DotsHomeView.java
+++ b/app/src/org/commcare/views/DotsHomeView.java
@@ -11,7 +11,8 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatButton;
+import com.google.android.material.button.MaterialButton;
+
 
 import org.commcare.dalvik.R;
 import org.commcare.utils.DotsData;
@@ -86,7 +87,7 @@ private void refresh() {
             table.addView(row);
         }
 
-        Button done = new AppCompatButton(this.getContext());
+        Button done = new MaterialButton(this.getContext());
         done.setId(666);
         done.setText("Finished");
         done.setOnClickListener(v -> listener.doneWithDOTS());
diff --git a/app/src/org/commcare/views/EntityDetailView.java b/app/src/org/commcare/views/EntityDetailView.java
index bf87f0d994..652bdf7f3b 100755
--- a/app/src/org/commcare/views/EntityDetailView.java
+++ b/app/src/org/commcare/views/EntityDetailView.java
@@ -1,11 +1,8 @@
 package org.commcare.views;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.os.Build;
-import androidx.annotation.IdRes;
 import android.text.method.LinkMovementMethod;
 import android.view.Display;
 import android.view.GestureDetector;
@@ -23,6 +20,9 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.IdRes;
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.commcare.activities.CommCareGraphActivity;
 import org.commcare.cases.entity.Entity;
 import org.commcare.core.graph.model.GraphData;
@@ -202,9 +202,16 @@ public void setParams(Detail d, Entity e, int index, int detailNumber) {
         if (veryLong) {
             detailRow.setOrientation(LinearLayout.VERTICAL);
             spacer.setVisibility(View.GONE);
+            if (isLabelEmpty(labelText)) {
+                label.setVisibility(GONE);
+            }
             label.setLayoutParams(fill);
             valuePane.setLayoutParams(fill);
         } else {
+            if (isLabelEmpty(labelText)) {
+                origLabel.weight = 0;
+                origValue.weight = detailRow.getWeightSum();
+            }
             if (detailRow.getOrientation() != LinearLayout.HORIZONTAL) {
                 detailRow.setOrientation(LinearLayout.HORIZONTAL);
                 spacer.setVisibility(View.INVISIBLE);
@@ -214,6 +221,12 @@ public void setParams(Detail d, Entity e, int index, int detailNumber) {
         }
     }
 
+    // Empty case detail Display Texts are represented with an HTML non-breaking space (&nbsp). This was expanded
+    // to also check for blank spaces
+    private boolean isLabelEmpty(String text) {
+        return text.replaceAll("\\s|&nbsp;", "").equals("");
+    }
+
     private boolean setUpText(String textField) {
         data.setText((textField));
         updateCurrentView(TEXT, data);
diff --git a/app/src/org/commcare/views/EntityView.java b/app/src/org/commcare/views/EntityView.java
index 34d77eed26..5d56cd7739 100755
--- a/app/src/org/commcare/views/EntityView.java
+++ b/app/src/org/commcare/views/EntityView.java
@@ -1,5 +1,7 @@
 package org.commcare.views;
 
+import static org.commcare.cases.util.StringUtils.normalize;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -15,18 +17,16 @@
 import android.widget.TextView;
 
 import org.commcare.android.logging.ForceCloseLogger;
+import org.commcare.cases.entity.AsyncEntity;
 import org.commcare.cases.entity.Entity;
-import org.commcare.dalvik.R;
 import org.commcare.core.graph.model.GraphData;
 import org.commcare.core.graph.util.GraphException;
+import org.commcare.dalvik.R;
 import org.commcare.graph.view.GraphView;
-import org.commcare.models.AsyncEntity;
 import org.commcare.suite.model.Detail;
 import org.commcare.suite.model.DetailField;
-import org.commcare.util.LogTypes;
 import org.commcare.utils.AndroidUtil;
 import org.commcare.utils.MediaUtil;
-import org.commcare.utils.StringUtils;
 import org.commcare.views.media.AudioPlaybackButton;
 import org.commcare.views.media.ViewId;
 import org.javarosa.core.services.Logger;
@@ -392,14 +392,14 @@ public static Spannable highlightSearches(String[] searchTerms, Spannable raw,
                 }
 
                 //make sure that we have the same consistency for our background match
-                backgroundString = StringUtils.normalize(backgroundString).trim();
+                backgroundString = normalize(backgroundString).trim();
             } else {
                 //Otherwise we basically want to treat the "Search" string and the display string
                 //the same way.
-                backgroundString = StringUtils.normalize(raw.toString());
+                backgroundString = normalize(raw.toString());
             }
 
-            String normalizedDisplayString = StringUtils.normalize(raw.toString());
+            String normalizedDisplayString = normalize(raw.toString());
 
             removeSpans(raw);
 
diff --git a/app/src/org/commcare/views/EntityViewTile.java b/app/src/org/commcare/views/EntityViewTile.java
index 7ed36576c6..5160a8b0f1 100644
--- a/app/src/org/commcare/views/EntityViewTile.java
+++ b/app/src/org/commcare/views/EntityViewTile.java
@@ -1,15 +1,10 @@
 package org.commcare.views;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.os.Build;
-import androidx.core.util.Pair;
-import androidx.legacy.widget.Space;
-import androidx.gridlayout.widget.GridLayout;
 import android.text.Spannable;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -20,9 +15,14 @@
 import android.widget.ImageView.ScaleType;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.util.Pair;
+import androidx.gridlayout.widget.GridLayout;
+import androidx.legacy.widget.Space;
+
+import org.commcare.cases.entity.AsyncEntity;
 import org.commcare.cases.entity.Entity;
 import org.commcare.dalvik.R;
-import org.commcare.models.AsyncEntity;
 import org.commcare.suite.model.Detail;
 import org.commcare.util.GridCoordinate;
 import org.commcare.util.GridStyle;
diff --git a/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java b/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java
index ab808d6b91..b42d75c0fe 100644
--- a/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java
+++ b/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java
@@ -12,7 +12,6 @@
 
 import org.commcare.CommCareNoficationManager;
 import org.commcare.activities.UpdateActivity;
-import org.commcare.engine.resource.AppInstallStatus;
 import org.commcare.tasks.ResultAndError;
 import org.commcare.tasks.TaskListener;
 import org.javarosa.core.services.locale.Localization;
@@ -22,19 +21,21 @@
  *
  * @author Phillip Mates (pmates@dimagi.com).
  */
-public class PinnedNotificationWithProgress
-        implements TaskListener<Integer, ResultAndError<AppInstallStatus>> {
+public class PinnedNotificationWithProgress<R>
+        implements TaskListener<Integer, ResultAndError<R>> {
     private final NotificationManager notificationManager;
     private final int notificationId;
     private final NotificationCompat.Builder notificationBuilder;
 
-    private final String progressText;
+    private String progressText;
+    private String titleText;
 
     public PinnedNotificationWithProgress(Context ctx, String titleText,
                                           String progressText,
                                           int largeIconResource) {
         this.notificationId = titleText.hashCode();
         this.progressText = progressText;
+        this.titleText = titleText;
 
         notificationManager =
                 (NotificationManager)ctx.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -48,7 +49,7 @@ public PinnedNotificationWithProgress(Context ctx, String titleText,
                 .setContentText(getProgressText(0, 0))
                 .setContentTitle(Localization.get(titleText))
                 .setProgress(100, 0, false)
-                .setSmallIcon(org.commcare.dalvik.R.drawable.notification)
+                .setSmallIcon(org.commcare.dalvik.R.drawable.commcare_actionbar_logo)
                 .setLargeIcon(largeIcon)
                 .setContentIntent(contentIntent)
                 .setWhen(System.currentTimeMillis())
@@ -61,6 +62,10 @@ private String getProgressText(int progress, int max) {
         return Localization.get(progressText, new String[]{"" + progress, "" + max});
     }
 
+    private String getProgressText(int completion) {
+        return Localization.get(progressText, new String[]{"" + completion});
+    }
+
     private PendingIntent buildPendingIntent(Context ctx) {
         int intentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
@@ -81,13 +86,22 @@ public void handleTaskUpdate(Integer... updateVals) {
             max = updateVals[1];
         }
 
-        notificationBuilder.setProgress(max, progress, false);
-        notificationBuilder.setContentText(getProgressText(progress, max));
+        // if max is -1, it means that the progress is percentage
+        if (max == -1){
+            notificationBuilder.setProgress(100, progress, false);
+            notificationBuilder.setContentText(getProgressText(progress));
+        }
+        else{
+            notificationBuilder.setProgress(max, progress, false);
+            notificationBuilder.setContentText(getProgressText(progress, max));
+        }
+        notificationBuilder.setContentTitle(Localization.get(titleText));
+
         notificationManager.notify(notificationId, notificationBuilder.build());
     }
 
     @Override
-    public void handleTaskCompletion(ResultAndError<AppInstallStatus> result) {
+    public void handleTaskCompletion(ResultAndError<R> result) {
         notificationManager.cancel(notificationId);
     }
 
@@ -95,4 +109,12 @@ public void handleTaskCompletion(ResultAndError<AppInstallStatus> result) {
     public void handleTaskCancellation() {
         notificationManager.cancel(notificationId);
     }
+
+    public void setTitleText(String titleText) {
+        this.titleText = titleText;
+    }
+
+    public void setProgressText(String progressText) {
+        this.progressText = progressText;
+    }
 }
diff --git a/app/src/org/commcare/views/dialogs/StandardAlertDialog.java b/app/src/org/commcare/views/dialogs/StandardAlertDialog.java
index 4b838d496c..d7fb7766c6 100644
--- a/app/src/org/commcare/views/dialogs/StandardAlertDialog.java
+++ b/app/src/org/commcare/views/dialogs/StandardAlertDialog.java
@@ -7,6 +7,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -86,7 +88,17 @@ public void setPositiveButton(CharSequence displayText, final DialogInterface.On
     }
 
     public void setNegativeButton(CharSequence displayText, final DialogInterface.OnClickListener buttonListener) {
+        setNegativeButton(displayText, buttonListener, false);
+    }
+
+    public void setNegativeButton(CharSequence displayText,
+                                  final DialogInterface.OnClickListener buttonListener,
+                                  boolean usePositiveButtonStyle) {
         Button negativeButton = this.view.findViewById(R.id.negative_button);
+        if (usePositiveButtonStyle) {
+            negativeButton.setTextAppearance(this.view.getContext(), R.style.Commcare_Button_Primary_Rounded);
+            negativeButton.setBackgroundColor(this.view.getResources().getColor(R.color.cc_brand_color));
+        }
         negativeButton.setText(displayText);
         negativeButton.setOnClickListener(v -> buttonListener.onClick(dialog, AlertDialog.BUTTON_NEGATIVE));
         negativeButton.setVisibility(View.VISIBLE);
@@ -113,4 +125,19 @@ public void dismissOnBackPress() {
             return true;
         });
     }
+
+    public void setCheckbox(CharSequence displayText, CompoundButton.OnCheckedChangeListener checkboxListener) {
+        CheckBox checkbox = this.view.findViewById(R.id.dialog_checkbox);
+        checkbox.setText(displayText);
+        if(checkboxListener != null) {
+            checkbox.setOnCheckedChangeListener(checkboxListener);
+        }
+        checkbox.setVisibility(View.VISIBLE);
+    }
+    public static StandardAlertDialog getBasicAlertDialogWithDisablingCheckbox(Context context, String title, String msg,
+                                                                               CompoundButton.OnCheckedChangeListener checkboxListener){
+        StandardAlertDialog d = new StandardAlertDialog(context, title, msg);
+        d.setCheckbox(Localization.get("dialog.do.not.show"), checkboxListener);
+        return d;
+    }
 }
diff --git a/app/src/org/commcare/views/media/CommCareMediaController.java b/app/src/org/commcare/views/media/CommCareMediaController.java
index 347148488b..0872a1366a 100644
--- a/app/src/org/commcare/views/media/CommCareMediaController.java
+++ b/app/src/org/commcare/views/media/CommCareMediaController.java
@@ -1,33 +1,56 @@
 package org.commcare.views.media;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.MediaController;
 
+import androidx.appcompat.app.AppCompatActivity;
+
+import org.commcare.activities.FullscreenVideoViewActivity;
+import org.commcare.activities.components.FormEntryConstants;
+import org.commcare.dalvik.R;
+import org.commcare.utils.AndroidUtil;
+import org.commcare.utils.FileUtil;
+
+import java.io.File;
+
 /**
- * Custom MediaController which provides a workaround to the issue where hide and show aren't working while adding it in the view hierarchy.
+ * Custom MediaController which provides a workaround to the issue where hide and show aren't
+ * working while adding it in the view hierarchy.
  * Note: Use only when you're manually adding MediaController in the view hierarchy.
  * Used here {@link MediaLayout}
  * @author $|-|!˅@M
  */
 public class CommCareMediaController extends MediaController {
 
+    public static final String INLINE_VIDEO_TIME_POSITION = "inline-video-time-position";
+
     // A mock to superclass' isShowing property.
     // {@link https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/widget/MediaController.java#96}
     private boolean _isShowing = false;
+    private ImageButton fullscreenBtn;
+    private boolean fullscreenMode;
 
-    public CommCareMediaController(Context context, AttributeSet attrs) {
+    public CommCareMediaController(Context context, AttributeSet attrs, boolean fullscreenMode) {
         super(context, attrs);
+        this.fullscreenMode = fullscreenMode;
     }
 
-    public CommCareMediaController(Context context, boolean useFastForward) {
+    public CommCareMediaController(Context context, boolean useFastForward, boolean fullscreenMode) {
         super(context, useFastForward);
+        this.fullscreenMode = fullscreenMode;
     }
 
-    public CommCareMediaController(Context context) {
+    public CommCareMediaController(Context context, boolean fullscreenMode) {
         super(context);
+        this.fullscreenMode = fullscreenMode;
     }
 
     @Override
@@ -50,4 +73,49 @@ public void hide() {
         ViewGroup parent = (ViewGroup) this.getParent();
         parent.setVisibility(View.GONE);
     }
+
+    @Override
+    public void setAnchorView(View view) {
+        super.setAnchorView(view);
+
+        int videoViewId = fullscreenMode ? R.id.fullscreen_video_view : R.id.inline_video_view;
+        CommCareVideoView videoView = view.findViewById(videoViewId);
+
+        if (videoView != null) {
+            addFullscreenButton(videoView);
+        }
+    }
+
+    private void addFullscreenButton(CommCareVideoView videoView) {
+        if (fullscreenBtn == null) {
+            fullscreenBtn = new ImageButton(getContext(), null, R.style.FullScreenVideoButton);
+            fullscreenBtn.setId(AndroidUtil.generateViewId());
+            if (fullscreenMode) {
+                fullscreenBtn.setImageResource(R.drawable.ic_media_exit_fullscreen);
+            } else {
+                fullscreenBtn.setImageResource(R.drawable.ic_media_fullscreen);
+            }
+            fullscreenBtn.setOnClickListener(view1 -> {
+                // if in fullscreen mode, we exit
+                if (fullscreenMode) {
+                    Intent i = new Intent();
+                    i.putExtra(CommCareMediaController.INLINE_VIDEO_TIME_POSITION, videoView.getCurrentPosition());
+                    ((AppCompatActivity)getContext()).setResult(Activity.RESULT_OK, i);
+                    ((AppCompatActivity)getContext()).finish();
+                } else {
+                    Intent intent = new Intent(getContext(), FullscreenVideoViewActivity.class);
+                    intent.setData(FileUtil.getUriForExternalFile(getContext(),
+                            new File(videoView.getVideoPath())));
+                    if (videoView.isPlaying()) {
+                        intent.putExtra(INLINE_VIDEO_TIME_POSITION, videoView.getCurrentPosition());
+                    }
+                    ((AppCompatActivity) getContext()).startActivityForResult(intent,
+                            FormEntryConstants.VIEW_VIDEO_FULLSCREEN);
+                }
+            });
+        }
+        FrameLayout.LayoutParams frameParams = new LayoutParams(LayoutParams.WRAP_CONTENT,
+                LayoutParams.WRAP_CONTENT, Gravity.END);
+        this.addView(fullscreenBtn, frameParams);
+    }
 }
diff --git a/app/src/org/commcare/views/media/CommCareVideoView.java b/app/src/org/commcare/views/media/CommCareVideoView.java
index 433e1e2e2b..3ec97f0421 100644
--- a/app/src/org/commcare/views/media/CommCareVideoView.java
+++ b/app/src/org/commcare/views/media/CommCareVideoView.java
@@ -1,6 +1,7 @@
 package org.commcare.views.media;
 
 import android.content.Context;
+import android.net.Uri;
 import android.util.AttributeSet;
 import android.widget.VideoView;
 
@@ -18,6 +19,8 @@ public class CommCareVideoView extends VideoView {
     private long duration;
     private long startTime;
 
+    private String videoPath;
+
     public CommCareVideoView(Context context) {
         super(context);
     }
@@ -54,6 +57,16 @@ protected void onDetachedFromWindow() {
         }
     }
 
+    @Override
+    public void setVideoPath(String videoPath){
+        super.setVideoPath(videoPath);
+        this.videoPath = videoPath;
+    }
+
+    public String getVideoPath() {
+        return videoPath;
+    }
+
     public interface VideoDetachedListener {
         void onVideoDetached(long duration);
     }
diff --git a/app/src/org/commcare/views/media/MediaLayout.java b/app/src/org/commcare/views/media/MediaLayout.java
index 4617cfd4ba..c304e31008 100644
--- a/app/src/org/commcare/views/media/MediaLayout.java
+++ b/app/src/org/commcare/views/media/MediaLayout.java
@@ -46,8 +46,8 @@
 
 import java.io.File;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import kotlinx.coroutines.Dispatchers;
 
@@ -108,7 +108,8 @@ public static MediaLayout buildComprehensiveLayout(Context context,
                                                        final String ttsText,
                                                        int questionIndex) {
         MediaLayout mediaLayout = new MediaLayout(context);
-        mediaLayout.setAVT(text, audioURI, imageURI, videoURI, bigImageURI, qrCodeContent, inlineVideoURI, false, questionIndex);
+        mediaLayout.setAVT(text, audioURI, imageURI, videoURI, bigImageURI, qrCodeContent, inlineVideoURI, false,
+                questionIndex);
         // Show TTS view only when audioURI is not present
         if (ttsText != null && audioURI == null) {
             mediaLayout.showTtsButton(ttsText);
@@ -184,7 +185,8 @@ private void setupStandardAudio(String audioURI, int questionIndex) {
     private void setupVideoButton(String videoURI) {
         if (videoURI != null) {
             boolean mediaPresent = FileUtil.referenceFileExists(videoURI);
-            videoButton.setImageResource(mediaPresent ? android.R.drawable.ic_media_play : R.drawable.update_download_icon);
+            videoButton.setImageResource(
+                    mediaPresent ? android.R.drawable.ic_media_play : R.drawable.update_download_icon);
             if (!mediaPresent) {
                 AndroidUtil.showToast(getContext(), R.string.video_download_prompt);
             }
@@ -207,7 +209,8 @@ private void setupVideoButton(String videoURI) {
                     i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                     try {
                         getContext().startActivity(i);
-                        FormEntryActivity.mFormController.getFormAnalyticsHelper().recordVideoPlaybackStart(videoFile);
+                        FormEntryActivity.mFormController.getFormAnalyticsHelper()
+                                .recordVideoPlaybackStart(videoFile);
                     } catch (ActivityNotFoundException e) {
                         Toast.makeText(getContext(),
                                 getContext().getString(R.string.activity_not_found, "view video"),
@@ -224,7 +227,8 @@ private void downloadMissingVideo(ImageButton videoButton, String videoURI) {
         MissingMediaDownloadHelper.requestMediaDownload(videoURI, Dispatchers.getDefault(), result -> {
             if (result instanceof MissingMediaDownloadResult.Success) {
                 boolean mediaPresent = FileUtil.referenceFileExists(videoURI);
-                videoButton.setImageResource(mediaPresent ? android.R.drawable.ic_media_play : R.drawable.update_download_icon);
+                videoButton.setImageResource(
+                        mediaPresent ? android.R.drawable.ic_media_play : R.drawable.update_download_icon);
                 AndroidUtil.showToast(getContext(), R.string.media_download_completed);
                 videoButton.setVisibility(VISIBLE);
             } else if (result instanceof MissingMediaDownloadResult.InProgress) {
@@ -307,12 +311,12 @@ private void setupInlineVideoView(String inlineVideoURI) {
                             setupInlineVideoView(inlineVideoURI);
                         });
             } else {
-                final CommCareMediaController ctrl = new CommCareMediaController(this.getContext());
+                final CommCareMediaController ctrl = new CommCareMediaController(this.getContext(), false);
                 ctrl.setId(AndroidUtil.generateViewId());
                 videoView.setOnPreparedListener(mediaPlayer -> {
-                    //Since MediaController will create a default set of controls and put them in a window floating above your application(From AndroidDocs)
-                    //It would never follow the parent view's animation or scroll.
-                    //So, adding the MediaController to the view hierarchy here.
+                    // Since MediaController will create a default set of controls and put them in a window
+                    // floating above your application(From AndroidDocs). It would never follow the parent view's
+                    // animation or scroll. So, adding the MediaController to the view hierarchy here.
                     FrameLayout frameLayout = (FrameLayout)ctrl.getParent();
                     ((ViewGroup)frameLayout.getParent()).removeView(frameLayout);
                     LayoutParams params = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
@@ -336,7 +340,8 @@ private void setupInlineVideoView(String inlineVideoURI) {
                     if (duration == 0) {
                         return;
                     }
-                    FirebaseAnalyticsUtil.reportInlineVideoPlayEvent(videoFilename, FileUtil.getDuration(videoFile), duration);
+                    FirebaseAnalyticsUtil.reportInlineVideoPlayEvent(videoFilename,
+                            FileUtil.getDuration(videoFile), duration);
                 });
 
                 videoView.setOnClickListener(v -> ViewUtil.hideVirtualKeyboard((AppCompatActivity)getContext()));
@@ -367,7 +372,8 @@ private void makeVideoViewVisible() {
         videoView.setLayoutParams(params);
     }
 
-    private void showMissingMediaView(String mediaUri, String errorMessage, boolean allowDownload, @Nullable Runnable completion) {
+    private void showMissingMediaView(String mediaUri, String errorMessage, boolean allowDownload,
+                                      @Nullable Runnable completion) {
         missingMediaView.setVisibility(VISIBLE);
         missingMediaStatus.setText(errorMessage);
         missingMediaStatus.setVisibility(VISIBLE);
@@ -378,7 +384,8 @@ private void showMissingMediaView(String mediaUri, String errorMessage, boolean
             progressBar.setVisibility(VISIBLE);
             downloadIcon.setVisibility(INVISIBLE);
             downloadIcon.setEnabled(false);
-            missingMediaStatus.setText(StringUtils.getStringRobust(getContext(), R.string.media_download_in_progress));
+            missingMediaStatus.setText(
+                    StringUtils.getStringRobust(getContext(), R.string.media_download_in_progress));
 
             MissingMediaDownloadHelper.requestMediaDownload(mediaUri, Dispatchers.getDefault(), result -> {
                 if (result instanceof MissingMediaDownloadResult.Success) {
diff --git a/app/src/org/commcare/views/widgets/AudioWidget.java b/app/src/org/commcare/views/widgets/AudioWidget.java
index 2640903297..1b1ad62899 100644
--- a/app/src/org/commcare/views/widgets/AudioWidget.java
+++ b/app/src/org/commcare/views/widgets/AudioWidget.java
@@ -4,10 +4,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.provider.MediaStore.Audio;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.dalvik.R;
 import org.commcare.logic.PendingCalloutInterface;
@@ -15,7 +18,6 @@
 import org.javarosa.form.api.FormEntryPrompt;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * Legacy Audio Widget that allows user to capture sounds by performing an intent callout
@@ -32,19 +34,19 @@ public AudioWidget(Context context, final FormEntryPrompt prompt, PendingCallout
     @Override
     protected void initializeButtons() {
         // setup capture button
-        mCaptureButton = new AppCompatButton(getContext());
+        mCaptureButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mCaptureButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.capture_audio),
                 !mPrompt.isReadOnly());
 
         // setup audio filechooser button
-        mChooseButton = new AppCompatButton(getContext());
+        mChooseButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mChooseButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.choose_sound),
                 !mPrompt.isReadOnly());
 
         // setup play button
-        mPlayButton = new AppCompatButton(getContext());
+        mPlayButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mPlayButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.play_audio),
                 !mPrompt.isReadOnly());
diff --git a/app/src/org/commcare/views/widgets/CommCareAudioWidget.java b/app/src/org/commcare/views/widgets/CommCareAudioWidget.java
index 01924196ac..e89b33764f 100644
--- a/app/src/org/commcare/views/widgets/CommCareAudioWidget.java
+++ b/app/src/org/commcare/views/widgets/CommCareAudioWidget.java
@@ -18,8 +18,10 @@
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.dalvik.R;
 import org.commcare.logic.PendingCalloutInterface;
+import org.commcare.util.LogTypes;
 import org.commcare.utils.StringUtils;
 import org.javarosa.core.model.data.IAnswerData;
+import org.javarosa.core.services.Logger;
 import org.javarosa.form.api.FormEntryPrompt;
 
 import java.io.File;
@@ -132,6 +134,7 @@ protected void captureAudio(FormEntryPrompt prompt) {
 
     @Override
     public void onRecordingCompletion(String audioFile) {
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Saving recording: " + audioFile);
         if (new File(audioFile).exists()) {
             setBinaryData(audioFile);
             togglePlayButton(true);
diff --git a/app/src/org/commcare/views/widgets/GeoPointWidget.java b/app/src/org/commcare/views/widgets/GeoPointWidget.java
index 3e3d83491e..82d2cbc214 100644
--- a/app/src/org/commcare/views/widgets/GeoPointWidget.java
+++ b/app/src/org/commcare/views/widgets/GeoPointWidget.java
@@ -10,6 +10,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.GeoPointActivity;
 import org.commcare.activities.GeoPointMapActivity;
 import org.commcare.activities.components.FormEntryConstants;
@@ -26,7 +28,6 @@
 import java.text.DecimalFormat;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * GeoPointWidget is the widget that allows the user to get GPS readings.
@@ -86,7 +87,7 @@ public GeoPointWidget(Context context, final FormEntryPrompt prompt, PendingCall
             viewButtonEnabled = false;
         }
 
-        mGetLocationButton = new AppCompatButton(getContext());
+        mGetLocationButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mGetLocationButton,
                 locButtonText,
                 !prompt.isReadOnly());
@@ -106,7 +107,7 @@ public GeoPointWidget(Context context, final FormEntryPrompt prompt, PendingCall
         });
 
         // setup 'view location' button
-        mViewButton = new AppCompatButton(getContext());
+        mViewButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mViewButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.show_location),
                 viewButtonEnabled);
diff --git a/app/src/org/commcare/views/widgets/ImageWidget.java b/app/src/org/commcare/views/widgets/ImageWidget.java
index 7c23da42b8..95d883a0c4 100644
--- a/app/src/org/commcare/views/widgets/ImageWidget.java
+++ b/app/src/org/commcare/views/widgets/ImageWidget.java
@@ -11,6 +11,7 @@
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.Display;
+import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
@@ -20,6 +21,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.CommCareApplication;
 import org.commcare.activities.FormEntryActivity;
 import org.commcare.activities.components.FormEntryConstants;
@@ -47,7 +50,6 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * Widget that allows user to take pictures, sounds or video and add them to the form.
@@ -93,7 +95,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
         mErrorTextView.setText("Selected file is not a valid image");
 
         // setup capture button
-        mCaptureButton = new AppCompatButton(getContext());
+        mCaptureButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mCaptureButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.capture_image),
                 !mPrompt.isReadOnly());
@@ -119,7 +121,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
         });
 
         // setup chooser button
-        mChooseButton = new AppCompatButton(getContext());
+        mChooseButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mChooseButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.choose_image),
                 !mPrompt.isReadOnly());
@@ -151,7 +153,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
         });
 
         // setup discard button
-        mDiscardButton = new AppCompatButton(getContext());
+        mDiscardButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mDiscardButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.discard_image),
                 !mPrompt.isReadOnly());
diff --git a/app/src/org/commcare/views/widgets/IntentWidget.java b/app/src/org/commcare/views/widgets/IntentWidget.java
index 67f38d9f22..02f3062bac 100644
--- a/app/src/org/commcare/views/widgets/IntentWidget.java
+++ b/app/src/org/commcare/views/widgets/IntentWidget.java
@@ -1,24 +1,21 @@
 package org.commcare.views.widgets;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import com.google.android.material.button.MaterialButton;
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.android.javarosa.IntentCallout;
 import org.commcare.logic.PendingCalloutInterface;
@@ -93,7 +90,7 @@ protected IntentWidget(Context context, FormEntryPrompt prompt, Intent in, Inten
         } else {
             mStringAnswer = new TextView(getContext());
         }
-        launchIntentButton = new AppCompatButton(getContext());
+        launchIntentButton = new MaterialButton(getContext());
         setupTextView();
         setupButton();
     }
diff --git a/app/src/org/commcare/views/widgets/MediaWidget.java b/app/src/org/commcare/views/widgets/MediaWidget.java
index d34a8a8e44..e717d0a4d8 100644
--- a/app/src/org/commcare/views/widgets/MediaWidget.java
+++ b/app/src/org/commcare/views/widgets/MediaWidget.java
@@ -309,12 +309,16 @@ private void encryptRecordedFileToDestination(String binaryPath) {
         String extension = FileUtil.getExtension(binaryPath);
         destMediaPath = mInstanceFolder + System.currentTimeMillis() +
                 customFileTag + "." + extension;
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Setting recording destination folder: " + destMediaPath
+                + "|" + HiddenPreferences.isMediaCaptureEncryptionEnabled());
         try {
             if (HiddenPreferences.isMediaCaptureEncryptionEnabled()) {
                 destMediaPath = destMediaPath + AES_EXTENSION;
                 EncryptionIO.encryptFile(binaryPath, destMediaPath, getSecretKey());
+                Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Media successfully encrypted and saved: " + destMediaPath);
             } else {
                 FileUtil.copyFile(binaryPath, destMediaPath);
+                Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Media successfully saved: " + destMediaPath);
             }
         } catch (IOException e) {
             showToast("form.attachment.copy.fail");
diff --git a/app/src/org/commcare/views/widgets/RecordingFragment.java b/app/src/org/commcare/views/widgets/RecordingFragment.java
index 95c11af3c2..70d071d907 100644
--- a/app/src/org/commcare/views/widgets/RecordingFragment.java
+++ b/app/src/org/commcare/views/widgets/RecordingFragment.java
@@ -1,10 +1,14 @@
 package org.commcare.views.widgets;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Rect;
+import android.media.AudioManager;
+import android.media.AudioRecordingConfiguration;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaPlayer;
@@ -23,17 +27,27 @@
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
 
 import org.commcare.CommCareApplication;
+import org.commcare.CommCareNoficationManager;
+import org.commcare.activities.DispatchActivity;
 import org.commcare.dalvik.R;
+import org.commcare.util.LogTypes;
+import org.commcare.utils.MediaUtil;
+import org.commcare.utils.NotificationUtil;
+import org.javarosa.core.services.Logger;
 import org.javarosa.core.services.locale.Localization;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.DialogFragment;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * A popup dialog fragment that handles recording_fragment and saving of audio
@@ -54,6 +68,7 @@ public class RecordingFragment extends DialogFragment {
 
     private static final int HEAAC_SAMPLE_RATE = 44100;
     private static final int AMRNB_SAMPLE_RATE = 8000;
+    private final int RECORDING_NOTIFICATION_ID = R.string.audio_recording_notification;
 
     private String fileName;
     private static final String FILE_EXT = ".mp3";
@@ -73,12 +88,12 @@ public class RecordingFragment extends DialogFragment {
     private long mLastStopTime;
     private boolean inPausedState = false;
     private boolean savedRecordingExists = false;
-
+    private AudioManager.AudioRecordingCallback audioRecordingCallback;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        layout = (LinearLayout)inflater.inflate(R.layout.recording_fragment, container);
-        disableScreenRotation((AppCompatActivity)getContext());
+        layout = (LinearLayout) inflater.inflate(R.layout.recording_fragment, container);
+        disableScreenRotation((AppCompatActivity) getContext());
         prepareButtons();
         prepareText();
         setWindowSize();
@@ -119,7 +134,7 @@ private void setWindowSize() {
         Rect displayRectangle = new Rect();
         Window window = getActivity().getWindow();
         window.getDecorView().getWindowVisibleDisplayFrame(displayRectangle);
-        layout.setMinimumWidth((int)(displayRectangle.width() * 0.9f));
+        layout.setMinimumWidth((int) (displayRectangle.width() * 0.9f));
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
     }
 
@@ -142,7 +157,6 @@ private void setActionText(String textKey) {
         actionButton.setText(Localization.get(textKey));
     }
 
-
     private void resetRecordingView() {
         if (recorder != null) {
             recorder.release();
@@ -165,19 +179,32 @@ private void resetRecordingView() {
     }
 
     private void startRecording() {
-        disableScreenRotation((AppCompatActivity)getContext());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if (MediaUtil.isRecordingActive(getContext())) {
+                Toast.makeText(getContext(), Localization.get("start.recording.failed"), Toast.LENGTH_SHORT).show();
+                Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording cancelled due to an ongoing recording");
+                return;
+            }
+        }
+
+        disableScreenRotation((AppCompatActivity) getContext());
         setCancelable(false);
         setupRecorder();
         recorder.start();
         recordingDuration.setBase(SystemClock.elapsedRealtime());
         recordingInProgress();
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording started");
+
+        // Extend the user extension if about to expire, this is to prevent the session from expiring in the
+        // middle of a recording
+        CommCareApplication.instance().getSession().extendUserSessionIfNeeded();
     }
 
     private void recordingInProgress() {
         recordingDuration.start();
         if (isPauseSupported()) {
             toggleRecording.setBackgroundResource(R.drawable.pause);
-            toggleRecording.setOnClickListener(v -> pauseRecording());
+            toggleRecording.setOnClickListener(v -> pauseRecording(true));
         } else {
             toggleRecording.setBackgroundResource(R.drawable.record_in_progress);
             toggleRecording.setOnClickListener(v -> stopRecording());
@@ -189,25 +216,38 @@ private void recordingInProgress() {
         discardRecording.setVisibility(View.INVISIBLE);
     }
 
-
     private void setupRecorder() {
         if (recorder == null) {
             recorder = new MediaRecorder();
         }
 
         boolean isHeAacSupported = isHeAacEncoderSupported();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            recorder.setAudioSource(MediaRecorder.AudioSource.VOICE_COMMUNICATION);
+        } else {
+            recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        }
 
-        recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            recorder.setPrivacySensitive(true);
+        }
         recorder.setAudioSamplingRate(isHeAacSupported ? HEAAC_SAMPLE_RATE : AMRNB_SAMPLE_RATE);
         recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
-        recorder.setOutputFile(fileName);
         if (isHeAacSupported) {
             recorder.setAudioEncoder(MediaRecorder.AudioEncoder.HE_AAC);
         } else {
             recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
         }
+        recorder.setOutputFile(fileName);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            registerAudioRecordingConfigurationChangeCallback();
+        }
         try {
             recorder.prepare();
+            Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Preparing recording: " + fileName
+                    + " | " + (isHeAacSupported ? HEAAC_SAMPLE_RATE : AMRNB_SAMPLE_RATE)
+                    + " | " + (isHeAacSupported ? MediaRecorder.AudioEncoder.HE_AAC : MediaRecorder.AudioEncoder.AMR_NB));
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -230,7 +270,8 @@ private boolean isHeAacEncoderSupported() {
                     MediaCodecInfo.CodecProfileLevel[] profileLevels = cap.profileLevels;
                     for (MediaCodecInfo.CodecProfileLevel profileLevel : profileLevels) {
                         int profile = profileLevel.profile;
-                        if (profile == MediaCodecInfo.CodecProfileLevel.AACObjectHE || profile == MediaCodecInfo.CodecProfileLevel.AACObjectHE_PS) {
+                        if (profile == MediaCodecInfo.CodecProfileLevel.AACObjectHE
+                                || profile == MediaCodecInfo.CodecProfileLevel.AACObjectHE_PS) {
                             return true;
                         }
                     }
@@ -243,6 +284,7 @@ private boolean isHeAacEncoderSupported() {
 
     @SuppressLint("NewApi")
     private void stopRecording() {
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording stopping");
         recordingDuration.stop();
         recordingProgress.setVisibility(View.INVISIBLE);
 
@@ -256,10 +298,12 @@ private void stopRecording() {
         toggleRecording.setOnClickListener(v -> playAudio());
         instruction.setText(Localization.get("after.recording"));
         enableSave();
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording stopped");
     }
 
     @SuppressLint("NewApi")
-    private void pauseRecording() {
+    private void pauseRecording(boolean pausedByUser) {
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording pausing");
         inPausedState = true;
         recordingDuration.stop();
         chronoPause();
@@ -268,7 +312,9 @@ private void pauseRecording() {
         enableSave();
         toggleRecording.setBackgroundResource(R.drawable.record_add);
         toggleRecording.setOnClickListener(v -> resumeRecording());
-        instruction.setText(Localization.get("pause.recording"));
+        instruction.setText(Localization.get(pausedByUser ? "pause.recording"
+                : "pause.recording.because.no.sound.captured"));
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording paused");
     }
 
     private void enableSave() {
@@ -280,24 +326,28 @@ private void enableSave() {
 
     @SuppressLint("NewApi")
     private void resumeRecording() {
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording resuming");
         inPausedState = false;
         chronoResume();
         recorder.resume();
         recordingInProgress();
+        Logger.log(LogTypes.TYPE_MEDIA_EVENT, "Recording resumed");
     }
 
     private boolean isPauseSupported() {
         Bundle args = getArguments();
         if (args != null) {
             String appearance = args.getString(APPEARANCE_ATTR_ARG_KEY);
-            return LONG_APPEARANCE_VALUE.equals(appearance) &&
-                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
+            return LONG_APPEARANCE_VALUE.equals(appearance)
+                    && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
         }
         return false;
     }
 
-
     private void saveRecording() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            unregisterAudioRecordingConfigurationChangeCallback();
+        }
         if (inPausedState) {
             stopRecording();
         }
@@ -318,7 +368,7 @@ public void setListener(RecordingCompletionListener listener) {
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-        enableScreenRotation((AppCompatActivity)getContext());
+        enableScreenRotation((AppCompatActivity) getContext());
         if (recorder != null) {
             recorder.release();
             this.recorder = null;
@@ -328,7 +378,7 @@ public void onDismiss(DialogInterface dialog) {
             try {
                 player.release();
             } catch (IllegalStateException e) {
-                //Do nothing because player wasn't recording
+                // Do nothing because player wasn't recording
             }
         }
     }
@@ -393,4 +443,68 @@ private void chronoResume() {
         }
         recordingDuration.start();
     }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private void registerAudioRecordingConfigurationChangeCallback() {
+        audioRecordingCallback = new AudioManager.AudioRecordingCallback() {
+            @Override
+            public void onRecordingConfigChanged(List<AudioRecordingConfiguration> configs) {
+                super.onRecordingConfigChanged(configs);
+                if (recorder == null) {
+                    return;
+                }
+
+                if (hasRecordingGoneSilent(configs)) {
+                    if (!inPausedState) {
+                        pauseRecording(false);
+                        NotificationUtil.showNotification(
+                                getContext(),
+                                CommCareNoficationManager.NOTIFICATION_CHANNEL_USER_SESSION_ID,
+                                RECORDING_NOTIFICATION_ID,
+                                Localization.get("recording.paused.due.another.app.recording.title"),
+                                Localization.get("recording.paused.due.another.app.recording.message"),
+                                new Intent(getContext(), DispatchActivity.class)
+                                        .setAction(Intent.ACTION_MAIN)
+                                        .addCategory(Intent.CATEGORY_LAUNCHER));
+                    }
+                } else {
+                    if (inPausedState) {
+                        NotificationUtil.cancelNotification(getContext(), RECORDING_NOTIFICATION_ID);
+                    }
+                }
+            }
+        };
+        ((AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE))
+                .registerAudioRecordingCallback(audioRecordingCallback, null);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private void unregisterAudioRecordingConfigurationChangeCallback() {
+        if (audioRecordingCallback != null) {
+            ((AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE))
+                    .unregisterAudioRecordingCallback(audioRecordingCallback);
+            audioRecordingCallback = null;
+        }
+    }
+
+    private boolean hasRecordingGoneSilent(List<AudioRecordingConfiguration> configs) {
+        if (recorder == null) {
+            return false;
+        }
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+            if (recorder.getActiveRecordingConfiguration() == null) {
+                return false;
+            }
+
+            Optional<AudioRecordingConfiguration> currentAudioConfig = configs.stream().filter(config ->
+                            config.getClientAudioSessionId() == recorder.getActiveRecordingConfiguration()
+                                    .getClientAudioSessionId())
+                    .findAny();
+            return currentAudioConfig.isPresent() ? currentAudioConfig.get().isClientSilenced() : false;
+        } else {
+            // TODO: Add logic to check if the recording has gone silent for Android 9 and prior
+            return false;
+        }
+    }
 }
diff --git a/app/src/org/commcare/views/widgets/SignatureWidget.java b/app/src/org/commcare/views/widgets/SignatureWidget.java
index 55cd397b32..9a84d75eb3 100644
--- a/app/src/org/commcare/views/widgets/SignatureWidget.java
+++ b/app/src/org/commcare/views/widgets/SignatureWidget.java
@@ -22,6 +22,7 @@
 import android.net.Uri;
 import android.util.Log;
 import android.view.Display;
+import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
@@ -31,6 +32,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.CommCareApplication;
 import org.commcare.activities.DrawActivity;
 import org.commcare.activities.FormEntryActivity;
@@ -51,7 +54,6 @@
 import javax.annotation.Nullable;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 import static org.commcare.views.widgets.ImageWidget.getFileToDisplay;
 
@@ -89,7 +91,7 @@ public SignatureWidget(Context context, FormEntryPrompt prompt, PendingCalloutIn
         mErrorTextView.setText("Selected file is not a valid image");
 
         // setup Blank Image Button
-        mSignButton = new AppCompatButton(getContext());
+        mSignButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mSignButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.sign_button),
                 !prompt.isReadOnly());
diff --git a/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java b/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java
index 8e2b6af41a..beb42e9527 100644
--- a/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java
+++ b/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java
@@ -1,16 +1,17 @@
 package org.commcare.views.widgets;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.AppCompatButton;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.dalvik.R;
 import org.commcare.utils.StringUtils;
 import org.javarosa.core.model.SelectChoice;
@@ -59,7 +60,7 @@ public SpinnerMultiWidget(final Context context, FormEntryPrompt prompt) {
         selections = new boolean[mItems.size()];
         answerItems = new CharSequence[mItems.size()];
         alert_builder = new AlertDialog.Builder(context);
-        button = new AppCompatButton(context);
+        button = new MaterialButton(context);
         selectionText = new TextView(getContext());
 
         // Build View
diff --git a/app/src/org/commcare/views/widgets/VideoWidget.java b/app/src/org/commcare/views/widgets/VideoWidget.java
index 20dea33ce2..cbd58982a3 100644
--- a/app/src/org/commcare/views/widgets/VideoWidget.java
+++ b/app/src/org/commcare/views/widgets/VideoWidget.java
@@ -4,10 +4,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.provider.MediaStore.Video;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.dalvik.R;
 import org.commcare.logic.PendingCalloutInterface;
@@ -15,7 +18,6 @@
 import org.javarosa.form.api.FormEntryPrompt;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * Widget that allows user to take pictures, sounds or video and add them to the form.
@@ -32,7 +34,7 @@ public VideoWidget(Context context, final FormEntryPrompt prompt, PendingCallout
     @Override
     protected void initializeButtons() {
         // setup capture button
-        mCaptureButton = new AppCompatButton(getContext());
+        mCaptureButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mCaptureButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.capture_video),
                 !mPrompt.isReadOnly());
@@ -55,7 +57,7 @@ protected void initializeButtons() {
         });
 
         // setup capture button
-        mChooseButton = new AppCompatButton(getContext());
+        mChooseButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mChooseButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.choose_video),
                 !mPrompt.isReadOnly());
@@ -77,7 +79,7 @@ protected void initializeButtons() {
         });
 
         // setup play button
-        mPlayButton = new AppCompatButton(getContext());
+        mPlayButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mPlayButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.play_video),
                 !mPrompt.isReadOnly());
diff --git a/app/src/org/commcare/xml/AndroidBulkCaseXmlParser.java b/app/src/org/commcare/xml/AndroidBulkCaseXmlParser.java
index 488c449e22..d1fa69ce5c 100644
--- a/app/src/org/commcare/xml/AndroidBulkCaseXmlParser.java
+++ b/app/src/org/commcare/xml/AndroidBulkCaseXmlParser.java
@@ -7,7 +7,7 @@
 import org.commcare.cases.model.Case;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.models.database.user.models.AndroidCaseIndexTable;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.xml.bulk.BulkProcessingCaseXmlParser;
 import org.javarosa.xml.util.InvalidStructureException;
 import org.kxml2.io.KXmlParser;
@@ -26,21 +26,21 @@
  * @author ctsims
  */
 public class AndroidBulkCaseXmlParser extends BulkProcessingCaseXmlParser {
-    private final EntityStorageCache mEntityCache;
+    private final CommCareEntityStorageCache mEntityCache;
     private final AndroidCaseIndexTable mCaseIndexTable;
     private final SqlStorage<ACase> storage;
 
     public AndroidBulkCaseXmlParser(KXmlParser parser,
                                     SqlStorage<ACase> storage) {
-        this(parser, storage, new EntityStorageCache("case"), new AndroidCaseIndexTable());
+        this(parser, storage, new CommCareEntityStorageCache("case"), new AndroidCaseIndexTable());
     }
 
     public AndroidBulkCaseXmlParser(KXmlParser parser,
                                     SqlStorage<ACase> storage,
-                                    EntityStorageCache entityStorageCache,
+                                    CommCareEntityStorageCache commCareEntityStorageCache,
                                     AndroidCaseIndexTable indexTable) {
         super(parser);
-        mEntityCache = entityStorageCache;
+        mEntityCache = commCareEntityStorageCache;
         mCaseIndexTable = indexTable;
         this.storage = storage;
     }
diff --git a/app/src/org/commcare/xml/AndroidCaseXmlParser.java b/app/src/org/commcare/xml/AndroidCaseXmlParser.java
index b7fb622cc6..5120566b07 100644
--- a/app/src/org/commcare/xml/AndroidCaseXmlParser.java
+++ b/app/src/org/commcare/xml/AndroidCaseXmlParser.java
@@ -12,7 +12,7 @@
 import org.commcare.engine.references.JavaHttpReference;
 import org.commcare.interfaces.CommcareRequestEndpoints;
 import org.commcare.models.database.user.models.AndroidCaseIndexTable;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.util.LogTypes;
 import org.commcare.utils.FileUtil;
 import org.commcare.utils.GlobalConstants;
@@ -39,18 +39,18 @@ public class AndroidCaseXmlParser extends CaseXmlParser {
     private final boolean processAttachments = true;
     private CommcareRequestEndpoints generator;
     @Nullable
-    private final EntityStorageCache mEntityCache;
+    private final CommCareEntityStorageCache mEntityCache;
     private final AndroidCaseIndexTable mCaseIndexTable;
 
     public AndroidCaseXmlParser(KXmlParser parser, IStorageUtilityIndexed storage,
-                                @Nullable EntityStorageCache entityCache, AndroidCaseIndexTable indexTable) {
+                                @Nullable CommCareEntityStorageCache entityCache, AndroidCaseIndexTable indexTable) {
         super(parser, storage);
         mEntityCache = entityCache;
         mCaseIndexTable = indexTable;
     }
 
     public AndroidCaseXmlParser(KXmlParser parser, IStorageUtilityIndexed storage) {
-        this(parser, storage, new EntityStorageCache("case"), new AndroidCaseIndexTable());
+        this(parser, storage, new CommCareEntityStorageCache("case"), new AndroidCaseIndexTable());
     }
 
     public AndroidCaseXmlParser(KXmlParser parser, boolean acceptCreateOverwrites,
@@ -58,7 +58,7 @@ public AndroidCaseXmlParser(KXmlParser parser, boolean acceptCreateOverwrites,
                                 CommcareRequestEndpoints generator) {
         super(parser, acceptCreateOverwrites, storage);
         this.generator = generator;
-        mEntityCache = new EntityStorageCache("case");
+        mEntityCache = new CommCareEntityStorageCache("case");
         mCaseIndexTable = new AndroidCaseIndexTable();
     }
 
diff --git a/app/templates/google-services.json b/app/templates/google-services.json
index 6ce843f2ad..ba9309c1cf 100644
--- a/app/templates/google-services.json
+++ b/app/templates/google-services.json
@@ -1,7 +1,7 @@
 {
   "project_info": {
     "project_number": "768065119425",
-    "firebase_url": "https://commcare-a57e4.firebaseio.com",
+    "firebase_url": "@firebaseDatabaseUrl@",
     "project_id": "commcare-a57e4",
     "storage_bucket": "commcare-a57e4.appspot.com"
   },
diff --git a/app/test-proguard.cfg b/app/test-proguard.cfg
new file mode 100644
index 0000000000..79e8605b0a
--- /dev/null
+++ b/app/test-proguard.cfg
@@ -0,0 +1,260 @@
+-dontwarn com.sun.javadoc.ClassDoc
+-dontwarn com.sun.javadoc.Doc
+-dontwarn com.sun.javadoc.DocErrorReporter
+-dontwarn com.sun.javadoc.FieldDoc
+-dontwarn com.sun.javadoc.RootDoc
+-dontwarn com.sun.javadoc.SeeTag
+-dontwarn com.sun.javadoc.Tag
+-dontwarn com.sun.source.tree.AnnotatedTypeTree
+-dontwarn com.sun.source.tree.AnnotationTree
+-dontwarn com.sun.source.tree.ArrayAccessTree
+-dontwarn com.sun.source.tree.ArrayTypeTree
+-dontwarn com.sun.source.tree.AssertTree
+-dontwarn com.sun.source.tree.AssignmentTree
+-dontwarn com.sun.source.tree.BinaryTree
+-dontwarn com.sun.source.tree.BlockTree
+-dontwarn com.sun.source.tree.BreakTree
+-dontwarn com.sun.source.tree.CaseTree
+-dontwarn com.sun.source.tree.CatchTree
+-dontwarn com.sun.source.tree.ClassTree
+-dontwarn com.sun.source.tree.CompilationUnitTree
+-dontwarn com.sun.source.tree.CompoundAssignmentTree
+-dontwarn com.sun.source.tree.ConditionalExpressionTree
+-dontwarn com.sun.source.tree.ContinueTree
+-dontwarn com.sun.source.tree.DoWhileLoopTree
+-dontwarn com.sun.source.tree.EmptyStatementTree
+-dontwarn com.sun.source.tree.EnhancedForLoopTree
+-dontwarn com.sun.source.tree.ErroneousTree
+-dontwarn com.sun.source.tree.ExpressionStatementTree
+-dontwarn com.sun.source.tree.ExpressionTree
+-dontwarn com.sun.source.tree.ForLoopTree
+-dontwarn com.sun.source.tree.IdentifierTree
+-dontwarn com.sun.source.tree.IfTree
+-dontwarn com.sun.source.tree.ImportTree
+-dontwarn com.sun.source.tree.InstanceOfTree
+-dontwarn com.sun.source.tree.IntersectionTypeTree
+-dontwarn com.sun.source.tree.LabeledStatementTree
+-dontwarn com.sun.source.tree.LambdaExpressionTree$BodyKind
+-dontwarn com.sun.source.tree.LambdaExpressionTree
+-dontwarn com.sun.source.tree.LineMap
+-dontwarn com.sun.source.tree.LiteralTree
+-dontwarn com.sun.source.tree.MemberReferenceTree$ReferenceMode
+-dontwarn com.sun.source.tree.MemberReferenceTree
+-dontwarn com.sun.source.tree.MemberSelectTree
+-dontwarn com.sun.source.tree.MethodInvocationTree
+-dontwarn com.sun.source.tree.MethodTree
+-dontwarn com.sun.source.tree.ModifiersTree
+-dontwarn com.sun.source.tree.NewArrayTree
+-dontwarn com.sun.source.tree.NewClassTree
+-dontwarn com.sun.source.tree.ParameterizedTypeTree
+-dontwarn com.sun.source.tree.ParenthesizedTree
+-dontwarn com.sun.source.tree.PrimitiveTypeTree
+-dontwarn com.sun.source.tree.ReturnTree
+-dontwarn com.sun.source.tree.Scope
+-dontwarn com.sun.source.tree.StatementTree
+-dontwarn com.sun.source.tree.SwitchTree
+-dontwarn com.sun.source.tree.SynchronizedTree
+-dontwarn com.sun.source.tree.ThrowTree
+-dontwarn com.sun.source.tree.Tree$Kind
+-dontwarn com.sun.source.tree.Tree
+-dontwarn com.sun.source.tree.TreeVisitor
+-dontwarn com.sun.source.tree.TryTree
+-dontwarn com.sun.source.tree.TypeCastTree
+-dontwarn com.sun.source.tree.TypeParameterTree
+-dontwarn com.sun.source.tree.UnaryTree
+-dontwarn com.sun.source.tree.UnionTypeTree
+-dontwarn com.sun.source.tree.VariableTree
+-dontwarn com.sun.source.tree.WhileLoopTree
+-dontwarn com.sun.source.tree.WildcardTree
+-dontwarn com.sun.source.util.JavacTask
+-dontwarn com.sun.source.util.SimpleTreeVisitor
+-dontwarn com.sun.source.util.SourcePositions
+-dontwarn com.sun.source.util.TaskEvent$Kind
+-dontwarn com.sun.source.util.TaskEvent
+-dontwarn com.sun.source.util.TaskListener
+-dontwarn com.sun.source.util.TreePath
+-dontwarn com.sun.source.util.TreePathScanner
+-dontwarn com.sun.source.util.TreeScanner
+-dontwarn com.sun.source.util.Trees
+-dontwarn com.sun.tools.javac.Main
+-dontwarn com.sun.tools.javac.api.JavacScope
+-dontwarn com.sun.tools.javac.api.JavacTaskImpl
+-dontwarn com.sun.tools.javac.code.Attribute$Array
+-dontwarn com.sun.tools.javac.code.Attribute$Class
+-dontwarn com.sun.tools.javac.code.Attribute$Compound
+-dontwarn com.sun.tools.javac.code.Attribute$Constant
+-dontwarn com.sun.tools.javac.code.Attribute$Enum
+-dontwarn com.sun.tools.javac.code.Attribute$TypeCompound
+-dontwarn com.sun.tools.javac.code.Attribute
+-dontwarn com.sun.tools.javac.code.BoundKind
+-dontwarn com.sun.tools.javac.code.Kinds$Kind
+-dontwarn com.sun.tools.javac.code.Kinds$KindSelector
+-dontwarn com.sun.tools.javac.code.Source
+-dontwarn com.sun.tools.javac.code.Symbol$ClassSymbol
+-dontwarn com.sun.tools.javac.code.Symbol$Completer
+-dontwarn com.sun.tools.javac.code.Symbol$CompletionFailure
+-dontwarn com.sun.tools.javac.code.Symbol$MethodSymbol
+-dontwarn com.sun.tools.javac.code.Symbol$PackageSymbol
+-dontwarn com.sun.tools.javac.code.Symbol$TypeSymbol
+-dontwarn com.sun.tools.javac.code.Symbol$TypeVariableSymbol
+-dontwarn com.sun.tools.javac.code.Symbol$VarSymbol
+-dontwarn com.sun.tools.javac.code.Symbol
+-dontwarn com.sun.tools.javac.code.Symtab
+-dontwarn com.sun.tools.javac.code.TargetType
+-dontwarn com.sun.tools.javac.code.Type$ArrayType
+-dontwarn com.sun.tools.javac.code.Type$CapturedType
+-dontwarn com.sun.tools.javac.code.Type$ClassType
+-dontwarn com.sun.tools.javac.code.Type$JCNoType
+-dontwarn com.sun.tools.javac.code.Type$MethodType
+-dontwarn com.sun.tools.javac.code.Type$TypeVar
+-dontwarn com.sun.tools.javac.code.Type$UnionClassType
+-dontwarn com.sun.tools.javac.code.Type$Visitor
+-dontwarn com.sun.tools.javac.code.Type$WildcardType
+-dontwarn com.sun.tools.javac.code.Type
+-dontwarn com.sun.tools.javac.code.TypeAnnotationPosition$TypePathEntry
+-dontwarn com.sun.tools.javac.code.TypeAnnotationPosition$TypePathEntryKind
+-dontwarn com.sun.tools.javac.code.TypeAnnotationPosition
+-dontwarn com.sun.tools.javac.code.TypeTag
+-dontwarn com.sun.tools.javac.code.Types$SimpleVisitor
+-dontwarn com.sun.tools.javac.code.Types
+-dontwarn com.sun.tools.javac.comp.CompileStates$CompileState
+-dontwarn com.sun.tools.javac.comp.DeferredAttr$AttrMode
+-dontwarn com.sun.tools.javac.comp.Env
+-dontwarn com.sun.tools.javac.comp.Resolve$RecoveryLoadClass
+-dontwarn com.sun.tools.javac.comp.Resolve
+-dontwarn com.sun.tools.javac.file.JavacFileManager
+-dontwarn com.sun.tools.javac.main.CommandLine
+-dontwarn com.sun.tools.javac.main.JavaCompiler
+-dontwarn com.sun.tools.javac.main.Option
+-dontwarn com.sun.tools.javac.model.JavacElements
+-dontwarn com.sun.tools.javac.model.JavacTypes
+-dontwarn com.sun.tools.javac.processing.JavacProcessingEnvironment
+-dontwarn com.sun.tools.javac.tree.EndPosTable
+-dontwarn com.sun.tools.javac.tree.JCTree
+-dontwarn com.sun.tools.javac.tree.JCTree$*
+-dontwarn com.sun.tools.javac.tree.Pretty
+-dontwarn com.sun.tools.javac.tree.TreeInfo
+-dontwarn com.sun.tools.javac.tree.TreeMaker
+-dontwarn com.sun.tools.javac.util.AbstractLog
+-dontwarn com.sun.tools.javac.util.Context
+-dontwarn com.sun.tools.javac.util.DiagnosticSource
+-dontwarn com.sun.tools.javac.util.JCDiagnostic$DiagnosticPosition
+-dontwarn com.sun.tools.javac.util.List
+-dontwarn com.sun.tools.javac.util.ListBuffer
+-dontwarn com.sun.tools.javac.util.Log$DiagnosticHandler
+-dontwarn com.sun.tools.javac.util.Log$DiscardDiagnosticHandler
+-dontwarn com.sun.tools.javac.util.Log
+-dontwarn com.sun.tools.javac.util.Name
+-dontwarn com.sun.tools.javac.util.Names
+-dontwarn com.sun.tools.javac.util.Options
+-dontwarn com.sun.tools.javac.util.Pair
+-dontwarn java.awt.CardLayout
+-dontwarn java.awt.Color
+-dontwarn java.awt.Component
+-dontwarn java.awt.Container
+-dontwarn java.awt.Dialog
+-dontwarn java.awt.Dimension
+-dontwarn java.awt.Frame
+-dontwarn java.awt.GridLayout
+-dontwarn java.awt.LayoutManager
+-dontwarn java.awt.SystemColor
+-dontwarn java.awt.Toolkit
+-dontwarn java.awt.event.ActionEvent
+-dontwarn java.awt.event.ActionListener
+-dontwarn java.awt.event.WindowAdapter
+-dontwarn java.awt.event.WindowEvent
+-dontwarn java.awt.event.WindowListener
+-dontwarn java.awt.image.BufferedImage
+-dontwarn java.lang.ClassValue
+-dontwarn java.lang.management.ManagementFactory
+-dontwarn java.lang.management.MemoryPoolMXBean
+-dontwarn java.lang.management.MemoryType
+-dontwarn java.lang.management.MemoryUsage
+-dontwarn java.lang.reflect.AnnotatedType
+-dontwarn javax.annotation.processing.AbstractProcessor
+-dontwarn javax.annotation.processing.Messager
+-dontwarn javax.annotation.processing.ProcessingEnvironment
+-dontwarn javax.annotation.processing.RoundEnvironment
+-dontwarn javax.annotation.processing.SupportedAnnotationTypes
+-dontwarn javax.annotation.processing.SupportedOptions
+-dontwarn javax.annotation.processing.SupportedSourceVersion
+-dontwarn javax.lang.model.SourceVersion
+-dontwarn javax.lang.model.element.AnnotationMirror
+-dontwarn javax.lang.model.element.AnnotationValue
+-dontwarn javax.lang.model.element.AnnotationValueVisitor
+-dontwarn javax.lang.model.element.Element
+-dontwarn javax.lang.model.element.ElementKind
+-dontwarn javax.lang.model.element.ElementVisitor
+-dontwarn javax.lang.model.element.ExecutableElement
+-dontwarn javax.lang.model.element.Modifier
+-dontwarn javax.lang.model.element.Name
+-dontwarn javax.lang.model.element.NestingKind
+-dontwarn javax.lang.model.element.PackageElement
+-dontwarn javax.lang.model.element.TypeElement
+-dontwarn javax.lang.model.element.TypeParameterElement
+-dontwarn javax.lang.model.element.VariableElement
+-dontwarn javax.lang.model.type.ArrayType
+-dontwarn javax.lang.model.type.DeclaredType
+-dontwarn javax.lang.model.type.ErrorType
+-dontwarn javax.lang.model.type.ExecutableType
+-dontwarn javax.lang.model.type.IntersectionType
+-dontwarn javax.lang.model.type.MirroredTypesException
+-dontwarn javax.lang.model.type.NoType
+-dontwarn javax.lang.model.type.NullType
+-dontwarn javax.lang.model.type.PrimitiveType
+-dontwarn javax.lang.model.type.ReferenceType
+-dontwarn javax.lang.model.type.TypeKind
+-dontwarn javax.lang.model.type.TypeMirror
+-dontwarn javax.lang.model.type.TypeVariable
+-dontwarn javax.lang.model.type.TypeVisitor
+-dontwarn javax.lang.model.type.UnionType
+-dontwarn javax.lang.model.type.WildcardType
+-dontwarn javax.lang.model.util.AbstractElementVisitor7
+-dontwarn javax.lang.model.util.ElementFilter
+-dontwarn javax.lang.model.util.Elements
+-dontwarn javax.lang.model.util.SimpleElementVisitor7
+-dontwarn javax.lang.model.util.SimpleTypeVisitor7
+-dontwarn javax.lang.model.util.Types
+-dontwarn javax.management.MBeanServer
+-dontwarn javax.management.MBeanServerConnection
+-dontwarn javax.script.ScriptEngine
+-dontwarn javax.script.ScriptEngineManager
+-dontwarn javax.swing.BorderFactory
+-dontwarn javax.swing.JButton
+-dontwarn javax.swing.JDialog
+-dontwarn javax.swing.JFrame
+-dontwarn javax.swing.JList
+-dontwarn javax.swing.JMenu
+-dontwarn javax.swing.JMenuBar
+-dontwarn javax.swing.JMenuItem
+-dontwarn javax.swing.JOptionPane
+-dontwarn javax.swing.JPanel
+-dontwarn javax.swing.JScrollPane
+-dontwarn javax.swing.JSplitPane
+-dontwarn javax.swing.JTextPane
+-dontwarn javax.swing.JViewport
+-dontwarn javax.swing.KeyStroke
+-dontwarn javax.swing.ListModel
+-dontwarn javax.swing.UIManager
+-dontwarn javax.swing.border.Border
+-dontwarn javax.swing.event.ListDataEvent
+-dontwarn javax.swing.event.ListDataListener
+-dontwarn javax.swing.event.ListSelectionEvent
+-dontwarn javax.swing.event.ListSelectionListener
+-dontwarn javax.tools.Diagnostic$Kind
+-dontwarn javax.tools.Diagnostic
+-dontwarn javax.tools.DiagnosticCollector
+-dontwarn javax.tools.DiagnosticListener
+-dontwarn javax.tools.JavaCompiler$CompilationTask
+-dontwarn javax.tools.JavaCompiler
+-dontwarn javax.tools.JavaFileManager
+-dontwarn javax.tools.JavaFileObject
+-dontwarn javax.tools.StandardJavaFileManager
+-dontwarn javax.tools.ToolProvider
+-dontwarn org.objectweb.asm.ClassReader
+-dontwarn org.objectweb.asm.ClassVisitor
+-dontwarn org.objectweb.asm.Handle
+-dontwarn org.objectweb.asm.Label
+-dontwarn org.objectweb.asm.MethodVisitor
+-dontwarn org.objectweb.asm.Opcodes
+-dontwarn org.objectweb.asm.Type
\ No newline at end of file
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/default/app_strings.txt b/app/unit-tests/resources/commcare-apps/identity_callouts/default/app_strings.txt
index 90164a5a0f..89742f0f58 100644
--- a/app/unit-tests/resources/commcare-apps/identity_callouts/default/app_strings.txt
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/default/app_strings.txt
@@ -10,8 +10,9 @@ case_autoload.raw.case_missing=Unable to find case referenced by auto-select cas
 case_autoload.raw.property_missing=The custom xpath expression specified for case auto-selecting could not be found: ${0}
 case_autoload.user.case_missing=Unable to find case referenced by auto-select case ID.
 case_autoload.user.property_missing=The user data key specified for case auto-selecting could not be found: ${0}
-case_autoload.usercase.case_missing=Unable to find case referenced by auto-select case ID.
+case_autoload.usercase.case_missing=This form affects the user case, but no user case id was found. Please contact your supervisor.
 case_autoload.usercase.property_missing=The user case specified for case auto-selecting could not be found: ${0}
+case_search.claimed_case.case_missing=Unable to find the selected case after performing a sync. Please try again.
 case_sharing.exactly_one_group=The case sharing settings for your user are incorrect. This user must be in exactly one case sharing group. Please contact your supervisor.
 cchq.case=Case
 cchq.referral=Referral
@@ -23,9 +24,9 @@ cchq.report_name_header=Report Name
 cchq.reports_last_updated_on=Reports last updated on
 en=English
 forms.m0f0=Registration Form
+forms.m0f1=Registration with Templates
 homescreen.title=Identity Integration Test
 lang.current=en
 m0.case_long.case_name_1.header=Name
 m0.case_short.case_name_1.header=Name
 modules.m0=Case List
-usercase.missing_id=This form affects the user case, but no user case id was found. Please contact your supervisor.
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/en/app_strings.txt b/app/unit-tests/resources/commcare-apps/identity_callouts/en/app_strings.txt
index 42339f89e5..243b00ab79 100644
--- a/app/unit-tests/resources/commcare-apps/identity_callouts/en/app_strings.txt
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/en/app_strings.txt
@@ -8,6 +8,7 @@ cchq.report_menu=Reports
 cchq.report_name_header=Report Name
 cchq.reports_last_updated_on=Reports last updated on
 forms.m0f0=Registration Form
+forms.m0f1=Registration with Templates
 homescreen.title=Identity Integration Test
 lang.current=en
 m0.case_long.case_name_1.header=Name
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/media_suite.xml b/app/unit-tests/resources/commcare-apps/identity_callouts/media_suite.xml
index 22824b89c8..89b829b6ea 100644
--- a/app/unit-tests/resources/commcare-apps/identity_callouts/media_suite.xml
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/media_suite.xml
@@ -1,2 +1,2 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<suite version="10" descriptor="Media Suite File"/>
+<suite version="24" descriptor="Media Suite File"/>
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-0.xml b/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-0.xml
index 29de4d811f..5f3d0618e2 100644
--- a/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-0.xml
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-0.xml
@@ -1,58 +1,91 @@
 <h:html xmlns:h="http://www.w3.org/1999/xhtml" xmlns:orx="http://openrosa.org/jr/xforms" xmlns="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:vellum="http://commcarehq.org/xforms/vellum">
-	<h:head>
-		<h:title>Registration Form</h:title>
-		<model>
-			<instance>
-				<data xmlns:jrm="http://dev.commcarehq.org/jr/xforms" xmlns="http://openrosa.org/formdesigner/39BBDBB3-7C04-472E-9D8F-DB640E63F466" uiVersion="1" version="15" name="Registration Form">
-					<question2/>
-					<duplicate_guid/>
-					<duplicate_score/>
-					<duplicate_strength/>
-					<identity_guid/>
-					<verification/>
-					<verify_guid/>
-					<verify_score/>
-					<verify_strength/>
-					<case xmlns="http://commcarehq.org/case/transaction/v2" case_id="" date_modified="" user_id=""><create><case_name/><owner_id/><case_type>case</case_type></create></case><orx:meta xmlns:cc="http://commcarehq.org/xforms"><orx:deviceID/><orx:timeStart/><orx:timeEnd/><orx:username/><orx:userID/><orx:instanceID/><cc:appVersion/><orx:drift/></orx:meta></data>
-			</instance><instance id="commcaresession" src="jr://instance/session"/>
-			<bind nodeset="/data/question2" type="intent"/>
-			<bind nodeset="/data/duplicate_guid"/>
-			<bind nodeset="/data/duplicate_score"/>
-			<bind nodeset="/data/duplicate_strength"/>
-			<bind nodeset="/data/identity_guid"/>
-			<bind nodeset="/data/verification" type="intent"/>
-			<bind nodeset="/data/verify_guid"/>
-			<bind nodeset="/data/verify_score"/>
-			<bind nodeset="/data/verify_strength"/>
-			<itext>
-				<translation lang="en" default="">
-					<text id="question2-label">
-						<value>Registration</value>
-					</text>
-					<text id="verification-label">
-						<value>Verification</value>
-					</text>
-				</translation>
-			</itext>
-			<bind calculate="/data/meta/timeEnd" nodeset="/data/case/@date_modified" type="xsd:dateTime"/><bind calculate="/data/meta/userID" nodeset="/data/case/@user_id"/><setvalue event="xforms-ready" ref="/data/case/@case_id" value="instance('commcaresession')/session/data/case_id_new_case_0"/><bind calculate="/data/question2" nodeset="/data/case/create/case_name"/><bind calculate="/data/meta/userID" nodeset="/data/case/create/owner_id"/><setvalue event="xforms-ready" ref="/data/meta/deviceID" value="instance('commcaresession')/session/context/deviceid"/><setvalue event="xforms-ready" ref="/data/meta/timeStart" value="now()"/><bind nodeset="/data/meta/timeStart" type="xsd:dateTime"/><setvalue event="xforms-revalidate" ref="/data/meta/timeEnd" value="now()"/><bind nodeset="/data/meta/timeEnd" type="xsd:dateTime"/><setvalue event="xforms-ready" ref="/data/meta/username" value="instance('commcaresession')/session/context/username"/><setvalue event="xforms-ready" ref="/data/meta/userID" value="instance('commcaresession')/session/context/userid"/><setvalue event="xforms-ready" ref="/data/meta/instanceID" value="uuid()"/><setvalue event="xforms-ready" ref="/data/meta/appVersion" value="instance('commcaresession')/session/context/appversion"/><setvalue event="xforms-revalidate" ref="/data/meta/drift" value="if(count(instance('commcaresession')/session/context/drift) = 1, instance('commcaresession')/session/context/drift, '')"/></model>
-		<odkx:intent xmlns:odkx="http://opendatakit.org/xforms" id="question2" class="org.commcare.identity.bioenroll">
-			<response key="guid" ref="/data/identity_guid"/>
-			<response key="match_guid" ref="/data/duplicate_guid"/>
-			<response key="match_confidence" ref="/data/duplicate_score"/>
-			<response key="match_strength" ref="/data/duplicate_strength"/>
-		</odkx:intent>
-		<odkx:intent xmlns:odkx="http://opendatakit.org/xforms" id="verification" class="org.commcare.identity.bioverify">
-			<response key="match_guid" ref="/data/verify_guid"/>
-			<response key="match_confidence" ref="/data/verify_score"/>
-			<response key="match_strength" ref="/data/verify_strength"/>
-		</odkx:intent>
-	</h:head>
-	<h:body>
-		<input ref="/data/question2" appearance="intent:question2">
-			<label ref="jr:itext('question2-label')"/>
-		</input>
-		<input ref="/data/verification" appearance="intent:verification">
-			<label ref="jr:itext('verification-label')"/>
-		</input>
-	</h:body>
-</h:html>
+  <h:head>
+    <h:title>Registration Form</h:title>
+    <model>
+      <instance>
+        <data xmlns:jrm="http://dev.commcarehq.org/jr/xforms" xmlns="http://openrosa.org/formdesigner/39BBDBB3-7C04-472E-9D8F-DB640E63F466" uiVersion="1" version="24" name="Registration Form">
+          <question2/>
+          <duplicate_guid/>
+          <duplicate_score/>
+          <duplicate_strength/>
+          <identity_guid/>
+          <verification/>
+          <verify_guid/>
+          <verify_score/>
+          <verify_strength/>
+          <case xmlns="http://commcarehq.org/case/transaction/v2" case_id="" date_modified="" user_id="">
+            <create>
+              <case_name/>
+              <owner_id/>
+              <case_type>case</case_type>
+            </create>
+          </case>
+          <orx:meta xmlns:cc="http://commcarehq.org/xforms">
+            <orx:deviceID/>
+            <orx:timeStart/>
+            <orx:timeEnd/>
+            <orx:username/>
+            <orx:userID/>
+            <orx:instanceID/>
+            <cc:appVersion/>
+            <orx:drift/>
+          </orx:meta>
+        </data>
+      </instance>
+      <instance id="commcaresession" src="jr://instance/session"/>
+      <bind nodeset="/data/question2" type="intent" required="true()"/>
+      <bind nodeset="/data/duplicate_guid"/>
+      <bind nodeset="/data/duplicate_score"/>
+      <bind nodeset="/data/duplicate_strength"/>
+      <bind nodeset="/data/identity_guid"/>
+      <bind nodeset="/data/verification" type="intent"/>
+      <bind nodeset="/data/verify_guid"/>
+      <bind nodeset="/data/verify_score"/>
+      <bind nodeset="/data/verify_strength"/>
+      <itext>
+        <translation lang="en" default="">
+          <text id="question2-label">
+            <value>Register</value>
+          </text>
+          <text id="verification-label">
+            <value>Verification</value>
+          </text>
+        </translation>
+      </itext>
+      <bind nodeset="/data/case/@date_modified" type="xsd:dateTime" calculate="/data/meta/timeEnd"/>
+      <bind nodeset="/data/case/@user_id" calculate="/data/meta/userID"/>
+      <setvalue ref="/data/case/@case_id" value="instance('commcaresession')/session/data/case_id_new_case_0" event="xforms-ready"/>
+      <bind nodeset="/data/case/create/case_name" calculate="/data/question2"/>
+      <bind nodeset="/data/case/create/owner_id" calculate="/data/meta/userID"/>
+      <setvalue ref="/data/meta/deviceID" value="instance('commcaresession')/session/context/deviceid" event="xforms-ready"/>
+      <setvalue ref="/data/meta/timeStart" value="now()" event="xforms-ready"/>
+      <bind nodeset="/data/meta/timeStart" type="xsd:dateTime"/>
+      <setvalue ref="/data/meta/timeEnd" value="now()" event="xforms-revalidate"/>
+      <bind nodeset="/data/meta/timeEnd" type="xsd:dateTime"/>
+      <setvalue ref="/data/meta/username" value="instance('commcaresession')/session/context/username" event="xforms-ready"/>
+      <setvalue ref="/data/meta/userID" value="instance('commcaresession')/session/context/userid" event="xforms-ready"/>
+      <setvalue ref="/data/meta/instanceID" value="uuid()" event="xforms-ready"/>
+      <setvalue ref="/data/meta/appVersion" value="instance('commcaresession')/session/context/appversion" event="xforms-ready"/>
+      <setvalue ref="/data/meta/drift" value="if(count(instance('commcaresession')/session/context/drift) = 1, instance('commcaresession')/session/context/drift, '')" event="xforms-revalidate"/>
+    </model>
+    <odkx:intent xmlns:odkx="http://opendatakit.org/xforms" id="question2" class="org.commcare.identity.bioenroll">
+      <response key="guid" ref="/data/identity_guid"/>
+      <response key="match_guid" ref="/data/duplicate_guid"/>
+      <response key="match_confidence" ref="/data/duplicate_score"/>
+      <response key="match_strength" ref="/data/duplicate_strength"/>
+    </odkx:intent>
+    <odkx:intent xmlns:odkx="http://opendatakit.org/xforms" id="verification" class="org.commcare.identity.bioverify">
+      <response key="match_guid" ref="/data/verify_guid"/>
+      <response key="match_confidence" ref="/data/verify_score"/>
+      <response key="match_strength" ref="/data/verify_strength"/>
+    </odkx:intent>
+  </h:head>
+  <h:body>
+    <input ref="/data/question2" appearance="intent:question2">
+      <label ref="jr:itext('question2-label')"/>
+    </input>
+    <input ref="/data/verification" appearance="intent:verification">
+      <label ref="jr:itext('verification-label')"/>
+    </input>
+  </h:body>
+</h:html>
\ No newline at end of file
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-1.xml b/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-1.xml
new file mode 100644
index 0000000000..03050af4c6
--- /dev/null
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/modules-0/forms-1.xml
@@ -0,0 +1,69 @@
+<h:html xmlns:h="http://www.w3.org/1999/xhtml" xmlns:orx="http://openrosa.org/jr/xforms" xmlns="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:vellum="http://commcarehq.org/xforms/vellum">
+  <h:head>
+    <h:title>Registration with Templates</h:title>
+    <model>
+      <instance>
+        <data xmlns:jrm="http://dev.commcarehq.org/jr/xforms" xmlns="http://openrosa.org/formdesigner/E3900AF4-43AC-435A-B0BB-E043AD9608A1" uiVersion="1" version="24" name="Registration with Templates">
+          <register/>
+          <guid/>
+          <left_index_finger_template/>
+          <left_middle_finger_template/>
+          <case xmlns="http://commcarehq.org/case/transaction/v2" case_id="" date_modified="" user_id="">
+            <create>
+              <case_name/>
+              <owner_id/>
+              <case_type>case</case_type>
+            </create>
+          </case>
+          <orx:meta xmlns:cc="http://commcarehq.org/xforms">
+            <orx:deviceID/>
+            <orx:timeStart/>
+            <orx:timeEnd/>
+            <orx:username/>
+            <orx:userID/>
+            <orx:instanceID/>
+            <cc:appVersion/>
+            <orx:drift/>
+          </orx:meta>
+        </data>
+      </instance>
+      <instance id="commcaresession" src="jr://instance/session"/>
+      <bind nodeset="/data/register" type="intent" required="true()"/>
+      <bind nodeset="/data/guid"/>
+      <bind nodeset="/data/left_index_finger_template"/>
+      <bind nodeset="/data/left_middle_finger_template"/>
+      <itext>
+        <translation lang="en" default="">
+          <text id="register-label">
+            <value>Register</value>
+          </text>
+        </translation>
+      </itext>
+      <bind nodeset="/data/case/@date_modified" type="xsd:dateTime" calculate="/data/meta/timeEnd"/>
+      <bind nodeset="/data/case/@user_id" calculate="/data/meta/userID"/>
+      <setvalue ref="/data/case/@case_id" value="instance('commcaresession')/session/data/case_id_new_case_0" event="xforms-ready"/>
+      <bind nodeset="/data/case/create/case_name" calculate="/data/register"/>
+      <bind nodeset="/data/case/create/owner_id" calculate="/data/meta/userID"/>
+      <setvalue ref="/data/meta/deviceID" value="instance('commcaresession')/session/context/deviceid" event="xforms-ready"/>
+      <setvalue ref="/data/meta/timeStart" value="now()" event="xforms-ready"/>
+      <bind nodeset="/data/meta/timeStart" type="xsd:dateTime"/>
+      <setvalue ref="/data/meta/timeEnd" value="now()" event="xforms-revalidate"/>
+      <bind nodeset="/data/meta/timeEnd" type="xsd:dateTime"/>
+      <setvalue ref="/data/meta/username" value="instance('commcaresession')/session/context/username" event="xforms-ready"/>
+      <setvalue ref="/data/meta/userID" value="instance('commcaresession')/session/context/userid" event="xforms-ready"/>
+      <setvalue ref="/data/meta/instanceID" value="uuid()" event="xforms-ready"/>
+      <setvalue ref="/data/meta/appVersion" value="instance('commcaresession')/session/context/appversion" event="xforms-ready"/>
+      <setvalue ref="/data/meta/drift" value="if(count(instance('commcaresession')/session/context/drift) = 1, instance('commcaresession')/session/context/drift, '')" event="xforms-revalidate"/>
+    </model>
+    <odkx:intent xmlns:odkx="http://opendatakit.org/xforms" id="register" class="org.commcare.identity.bioenroll">
+      <response key="guid" ref="/data/guid"/>
+      <response key="left_index_finger_template" ref="/data/left_index_finger_template"/>
+      <response key="left_middle_finger_template" ref="/data/left_middle_finger_template"/>
+    </odkx:intent>
+  </h:head>
+  <h:body>
+    <input ref="/data/register" appearance="intent:register">
+      <label ref="jr:itext('register-label')"/>
+    </input>
+  </h:body>
+</h:html>
\ No newline at end of file
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/profile.ccpr b/app/unit-tests/resources/commcare-apps/identity_callouts/profile.ccpr
index fb75ce8dd8..01a2868eed 100644
--- a/app/unit-tests/resources/commcare-apps/identity_callouts/profile.ccpr
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/profile.ccpr
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<profile version="10"
-         update="https://www.commcarehq.org/a/shubhamgoyaltest/apps/download/844a399d13204c2792e4f81ae878eb7e/media_profile.ccpr?latest=true&amp;profile=None"
+<profile version="24"
+         update="https://www.commcarehq.org/a/shubhamgoyaltest/apps/download/4908aeeaceec4c0e8357028418db78f1/media_profile.ccpr?latest=true&amp;profile=None"
          requiredMajor="2"
          requiredMinor="49"
          requiredMinimal="7"
@@ -11,16 +11,16 @@
     <property key="BackupMode" value="file_mode" force="true"/>
     <property key="backup-url" value="file:///E:/CommCare.Backup" force="true"/>
     <property key="restore-url" value="file:///E:/CommCare.Backup" force="true"/>
-    <property key="ota-restore-url" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/restore/844a399d13204c2792e4f81ae878eb7e/" force="true"/>
-    <property key="ota-restore-url-testing" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/restore/844a399d13204c2792e4f81ae878eb7e/" force="true"/>
-    <property key="PostURL" value="https://www.commcarehq.org/a/shubhamgoyaltest/receiver/secure/844a399d13204c2792e4f81ae878eb7e/" force="true"/>
-    <property key="PostTestURL" value="https://www.commcarehq.org/a/shubhamgoyaltest/receiver/secure/844a399d13204c2792e4f81ae878eb7e/" force="true"/>
+    <property key="ota-restore-url" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/restore/4908aeeaceec4c0e8357028418db78f1/" force="true"/>
+    <property key="ota-restore-url-testing" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/restore/4908aeeaceec4c0e8357028418db78f1/" force="true"/>
+    <property key="PostURL" value="https://www.commcarehq.org/a/shubhamgoyaltest/receiver/secure/4908aeeaceec4c0e8357028418db78f1/" force="true"/>
+    <property key="PostTestURL" value="https://www.commcarehq.org/a/shubhamgoyaltest/receiver/secure/4908aeeaceec4c0e8357028418db78f1/" force="true"/>
     <property key="key_server" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/keys/" force="true"/>
     <property key="cur_locale" value="en" force="false"/>
     <property key="cc_user_domain" value="shubhamgoyaltest.commcarehq.org" force="true"/>
     <property key="jr_openrosa_api" value="1.0" force="true"/>
     
-    <property key="heartbeat-url" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/heartbeat/844a399d13204c2792e4f81ae878eb7e/?build_profile_id=" force="true"/>
+    <property key="heartbeat-url" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/heartbeat/4908aeeaceec4c0e8357028418db78f1/?build_profile_id=" force="true"/>
     
     
     
@@ -29,17 +29,11 @@
     
         <property key="log_prop_weekly" value="log_short" force="true"/>
     
-        <property key="cc-user-mode" value="cc-u-normal" force="true"/>
-    
-        <property key="cc-send-unsent" value="cc-su-auto" force="true"/>
-    
-        <property key="extra_key_action" value="audio" force="true"/>
-    
         <property key="cc-show-saved" value="no" force="true"/>
     
         <property key="cc-show-incomplete" value="no" force="true"/>
     
-        <property key="recovery-measures-url" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/recovery_measures/844a399d13204c2792e4f81ae878eb7e/" force="true"/>
+        <property key="recovery-measures-url" value="https://www.commcarehq.org/a/shubhamgoyaltest/phone/recovery_measures/4908aeeaceec4c0e8357028418db78f1/" force="true"/>
     
 
     <!-- end -->
@@ -55,20 +49,21 @@
         
         <users active="true">
         </users>
+        
     </features>
 
-    <suite><resource id="suite" version="10">
+    <suite><resource id="suite" version="24">
         
             <location authority="local">./suite.xml</location>
         
-        <location authority="remote">https://www.commcarehq.org/a/shubhamgoyaltest/apps/download/844a399d13204c2792e4f81ae878eb7e/suite.xml</location>
+        <location authority="remote">https://www.commcarehq.org/a/shubhamgoyaltest/apps/download/4908aeeaceec4c0e8357028418db78f1/suite.xml</location>
     </resource></suite>
     
-    <suite><resource id="media-suite" version="10">
+    <suite><resource id="media-suite" version="24">
         
             <location authority="local">./media_suite.xml</location>
         
-        <location authority="remote">https://www.commcarehq.org/a/shubhamgoyaltest/apps/download/844a399d13204c2792e4f81ae878eb7e/media_suite.xml</location>
+        <location authority="remote">https://www.commcarehq.org/a/shubhamgoyaltest/apps/download/4908aeeaceec4c0e8357028418db78f1/media_suite.xml</location>
     </resource></suite>
     
 </profile>
diff --git a/app/unit-tests/resources/commcare-apps/identity_callouts/suite.xml b/app/unit-tests/resources/commcare-apps/identity_callouts/suite.xml
index 3206001933..5b8b28ddeb 100644
--- a/app/unit-tests/resources/commcare-apps/identity_callouts/suite.xml
+++ b/app/unit-tests/resources/commcare-apps/identity_callouts/suite.xml
@@ -1,19 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<suite version="10" descriptor="Suite File">
+<suite version="24" descriptor="Suite File">
   <xform>
-    <resource id="b443f289608f4bdbb18a925aafe4fdb7" version="9" descriptor="Form: (Module Case List) - Registration Form">
+    <resource id="b443f289608f4bdbb18a925aafe4fdb7" version="24" descriptor="Form: (Module Case List) - Registration Form">
       <location authority="local">./modules-0/forms-0.xml</location>
       <location authority="remote">./modules-0/forms-0.xml</location>
     </resource>
   </xform>
+  <xform>
+    <resource id="7341d9cc0e304f83bb69e5c4e4d098cc" version="24" descriptor="Form: (Module Case List) - Registration with Templates">
+      <location authority="local">./modules-0/forms-1.xml</location>
+      <location authority="remote">./modules-0/forms-1.xml</location>
+    </resource>
+  </xform>
   <locale language="default">
-    <resource id="app_default_strings" version="10" descriptor="Translations: Default Language">
+    <resource id="app_default_strings" version="24" descriptor="Translations: Default Language">
       <location authority="local">./default/app_strings.txt</location>
       <location authority="remote">./default/app_strings.txt</location>
     </resource>
   </locale>
   <locale language="en">
-    <resource id="app_en_strings" version="10" descriptor="Translations: English">
+    <resource id="app_en_strings" version="24" descriptor="Translations: English">
       <location authority="local">./en/app_strings.txt</location>
       <location authority="remote">./en/app_strings.txt</location>
     </resource>
@@ -72,10 +78,22 @@
       <datum id="case_id_new_case_0" function="uuid()"/>
     </session>
   </entry>
+  <entry>
+    <form>http://openrosa.org/formdesigner/E3900AF4-43AC-435A-B0BB-E043AD9608A1</form>
+    <command id="m0-f1">
+      <text>
+        <locale id="forms.m0f1"/>
+      </text>
+    </command>
+    <session>
+      <datum id="case_id_new_case_0" function="uuid()"/>
+    </session>
+  </entry>
   <menu id="m0">
     <text>
       <locale id="modules.m0"/>
     </text>
     <command id="m0-f0"/>
+    <command id="m0-f1"/>
   </menu>
 </suite>
diff --git a/app/unit-tests/src/org/commcare/CommCareTestApplication.java b/app/unit-tests/src/org/commcare/CommCareTestApplication.java
index eb38ef32cb..368a3cc496 100644
--- a/app/unit-tests/src/org/commcare/CommCareTestApplication.java
+++ b/app/unit-tests/src/org/commcare/CommCareTestApplication.java
@@ -201,7 +201,6 @@ public void startUserSession(byte[] symetricKey, UserKeyRecord record, boolean r
         // manually create/setup session service because robolectric doesn't
         // really support services
         CommCareSessionService ccService = startRoboCommCareService();
-        ccService.createCipherPool();
         ccService.prepareStorage(symetricKey, record);
         User user = getUserFromDb(ccService, record);
         if (user == null && cachedUserPassword != null) {
diff --git a/app/unit-tests/src/org/commcare/android/tests/DataPullTaskTest.java b/app/unit-tests/src/org/commcare/android/tests/DataPullTaskTest.java
index 1d3d2992d8..93defd2edf 100644
--- a/app/unit-tests/src/org/commcare/android/tests/DataPullTaskTest.java
+++ b/app/unit-tests/src/org/commcare/android/tests/DataPullTaskTest.java
@@ -163,7 +163,9 @@ private static void runDataPull(Integer[] resultCodes, String[] payloadResources
         LocalReferencePullResponseFactory.setRequestPayloads(payloadResources);
 
         DataPullTask<Object> task =
-                new DataPullTask<Object>("test", "123", null, "fake.server.com", ApplicationProvider.getApplicationContext(), LocalReferencePullResponseFactory.INSTANCE, false) {
+                new DataPullTask<Object>("test", "123", null,
+                        "fake.server.com", ApplicationProvider.getApplicationContext(),
+                        LocalReferencePullResponseFactory.INSTANCE, false, false) {
                     @Override
                     protected void deliverResult(Object o, ResultAndError<PullTaskResult> pullTaskResultResultAndError) {
                         dataPullResult = pullTaskResultResultAndError;
diff --git a/app/unit-tests/src/org/commcare/android/tests/activities/QueryRequestActivityTest.java b/app/unit-tests/src/org/commcare/android/tests/activities/QueryRequestActivityTest.java
index 2a0cbdcd22..9a09339bfb 100644
--- a/app/unit-tests/src/org/commcare/android/tests/activities/QueryRequestActivityTest.java
+++ b/app/unit-tests/src/org/commcare/android/tests/activities/QueryRequestActivityTest.java
@@ -236,7 +236,7 @@ public void reloadQueryActivityStateTest() {
     public void receiveEmptyQueryResultTest() {
         ModernHttpRequesterMock.setResponseCodes(new Integer[]{200, 200, 200});
         ModernHttpRequesterMock.setExpectedUrls(
-                new String[]{"https://www.fake.com/patient_search/?name=francisco&state=&device_id=000000000000000&patient_id=&district="});
+                new String[]{"https://www.fake.com/patient_search/?name=francisco&device_id=000000000000000"});
         ModernHttpRequesterMock.setRequestPayloads(
                 new String[]{"jr://resource/commcare-apps/case_search_and_claim/empty-query-result-one-tag.xml",
                         "jr://resource/commcare-apps/case_search_and_claim/empty-query-result-two-tags.xml",
diff --git a/app/unit-tests/src/org/commcare/android/tests/application/AppUpdateTest.kt b/app/unit-tests/src/org/commcare/android/tests/application/AppUpdateTest.kt
index 2980320f80..994dff641b 100644
--- a/app/unit-tests/src/org/commcare/android/tests/application/AppUpdateTest.kt
+++ b/app/unit-tests/src/org/commcare/android/tests/application/AppUpdateTest.kt
@@ -82,7 +82,7 @@ class AppUpdateTest {
         UpdateUtils.installUpdate(profileRef,
                 AppInstallStatus.UpToDate,
                 AppInstallStatus.UnknownFailure)
-        checkUpdateComplete(6, true, false)
+        checkUpdateComplete(6, true, true)
     }
 
     @Test
@@ -191,4 +191,4 @@ class AppUpdateTest {
         private val TAG = AppUpdateTest::class.java.simpleName
         private const val REF_BASE_DIR = "jr://resource/commcare-apps/update_tests/"
     }
-}
\ No newline at end of file
+}
diff --git a/app/unit-tests/src/org/commcare/android/tests/formentry/IdentityCalloutTests.kt b/app/unit-tests/src/org/commcare/android/tests/formentry/IdentityCalloutTests.kt
index 3258b001ca..954475a607 100644
--- a/app/unit-tests/src/org/commcare/android/tests/formentry/IdentityCalloutTests.kt
+++ b/app/unit-tests/src/org/commcare/android/tests/formentry/IdentityCalloutTests.kt
@@ -3,6 +3,7 @@ package org.commcare.android.tests.formentry
 import android.app.Activity
 import android.app.Instrumentation
 import android.content.Intent
+import android.util.Base64
 import android.widget.Button
 import android.widget.ImageButton
 import androidx.test.espresso.intent.Intents
@@ -16,6 +17,7 @@ import org.commcare.android.resource.installers.XFormAndroidInstaller
 import org.commcare.android.util.ActivityLaunchUtils
 import org.commcare.android.util.TestAppInstaller
 import org.commcare.android.util.TestUtils
+import org.commcare.commcaresupportlibrary.identity.BiometricIdentifier
 import org.commcare.commcaresupportlibrary.identity.IdentityResponseBuilder
 import org.commcare.commcaresupportlibrary.identity.model.IdentificationMatch
 import org.commcare.commcaresupportlibrary.identity.model.MatchResult
@@ -23,6 +25,7 @@ import org.commcare.commcaresupportlibrary.identity.model.MatchStrength
 import org.commcare.dalvik.R
 import org.commcare.provider.IdentityCalloutHandler
 import org.junit.After
+import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
@@ -39,6 +42,7 @@ class IdentityCalloutTests {
     @JvmField
     var intentsRule = ActivityScenarioRule(FormEntryActivity::class.java)
 
+
     @Before
     fun setup() {
         Intents.init()
@@ -96,6 +100,33 @@ class IdentityCalloutTests {
         assertEquals(guidToConfidenceMap.elementAt(2), "★★★")
     }
 
+    @Test
+    fun testRegistrationWithTemplates() {
+        val formEntryActivity = ActivityLaunchUtils.launchFormEntry("m0-f1")
+
+        var templates: HashMap<BiometricIdentifier, ByteArray> = HashMap(2)
+        templates[BiometricIdentifier.LEFT_INDEX_FINGER] =
+                byteArrayOf(0, 0, -21, -67, 0, -64, 25, 62, -69, -124, -91, 29, -50, -107, 58)
+        templates[BiometricIdentifier.LEFT_MIDDLE_FINGER] =
+                byteArrayOf(122, -91, 114, 62, 107, -95, -69, 28, 110, 123, 72, 71, -86, -117, 126)
+
+        // get Identity response and save Base64 encoded template to form question
+        intendRegistrationWithTemplatesIntent(templates)
+        performIntentCallout(formEntryActivity)
+        TestUtils.assertFormValue("/data/guid", "test-case-unique-guid")
+        for ((key, value) in templates) {
+            TestUtils.assertFormValue("/data/" + key.calloutResponseKey,
+                    Base64.encodeToString(value, Base64.DEFAULT))
+        }
+
+        // retrieve Base64 encoded template from form question, decode and compare with initial
+        // value
+        for ((key, value) in templates) {
+            var base64EncodedTemplate = TestUtils.getFormValue("/data/" + key.calloutResponseKey) as String;
+            assertArrayEquals(Base64.decode(base64EncodedTemplate, Base64.DEFAULT), value)
+        }
+    }
+
     private fun getIdentificationIntent(): Intent {
         val identifications = ArrayList<IdentificationMatch>()
         identifications.add(IdentificationMatch("guid-1", MatchResult(80, MatchStrength.FOUR_STARS)))
@@ -120,6 +151,14 @@ class IdentityCalloutTests {
         intending(hasAction("org.commcare.identity.bioenroll")).respondWith(result)
     }
 
+    private fun intendRegistrationWithTemplatesIntent(templates: HashMap<BiometricIdentifier, ByteArray>) {
+        val registration = IdentityResponseBuilder
+                .registrationResponse("test-case-unique-guid", templates)
+                .build()
+        val result = Instrumentation.ActivityResult(Activity.RESULT_OK, registration)
+        intending(hasAction("org.commcare.identity.bioenroll")).respondWith(result)
+    }
+
     private fun intendDuplicatesDuringRegistration() {
         val result = Instrumentation.ActivityResult(Activity.RESULT_OK, getIdentificationIntent())
         intending(hasAction("org.commcare.identity.bioenroll")).respondWith(result)
diff --git a/app/unit-tests/src/org/commcare/android/tests/navigation/ExternalLaunchTests.kt b/app/unit-tests/src/org/commcare/android/tests/navigation/ExternalLaunchTests.kt
index 6ed50bd754..08ce88849b 100644
--- a/app/unit-tests/src/org/commcare/android/tests/navigation/ExternalLaunchTests.kt
+++ b/app/unit-tests/src/org/commcare/android/tests/navigation/ExternalLaunchTests.kt
@@ -6,18 +6,21 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.commcare.CommCareTestApplication
 import org.commcare.activities.DispatchActivity
 import org.commcare.activities.FormEntryActivity
+import org.commcare.activities.LoginActivity
 import org.commcare.activities.StandardHomeActivity
 import org.commcare.android.util.TestAppInstaller
 import org.commcare.android.util.TestUtils
-import org.junit.Assert
-import org.junit.Assert.assertEquals
+import org.commcare.commcaresupportlibrary.CommCareLauncher
+import org.commcare.commcaresupportlibrary.CommCareLauncher.SESSION_ENDPOINT_APP_ID
+import org.commcare.util.screen.CommCareSessionException
+import org.commcare.utils.SessionUnavailableException
+import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import org.robolectric.Shadows
 import org.robolectric.annotation.Config
-import java.util.ArrayList
 
 
 @Config(application = CommCareTestApplication::class)
@@ -33,6 +36,39 @@ class ExternalLaunchTests {
         TestUtils.processResourceTransactionIntoAppDb("/commcare-apps/case_list_lookup/restore.xml")
     }
 
+    @Test
+    fun testLaunchWithAppId() {
+        // verify initial state
+        val indexAndCacheTestAppId = "000b3b9ecb0806331fbd1526616eb718"
+        assertEquals(indexAndCacheTestAppId, CommCareTestApplication.instance().currentApp.uniqueId)
+        assertEquals("test", CommCareTestApplication.instance().session.loggedInUser.username)
+
+        // Install another app, this will also seat this app as current app
+        TestAppInstaller.installApp("jr://resource/commcare-apps/archive_form_tests/profile.ccpr")
+        val archiveFormTestsAppId = "6a03772aedd992c9f2c9c2198a248184"
+        assertEquals(archiveFormTestsAppId, CommCareTestApplication.instance().currentApp.uniqueId)
+        assertEquals("test", CommCareTestApplication.instance().session.loggedInUser.username)
+
+        // Request launch for seated app, since user is logged in already we should end up on app home screen
+        launchAndVerifyCCWithAppId(archiveFormTestsAppId, StandardHomeActivity::class.java.name)
+
+        // Request launch for non seated app, this should cause user to log out and show user Login Screen
+        launchAndVerifyCCWithAppId(indexAndCacheTestAppId, LoginActivity::class.java.name)
+        assertThrows(SessionUnavailableException::class.java) {
+            CommCareTestApplication.instance().session.loggedInUser
+        }
+    }
+
+    private fun launchAndVerifyCCWithAppId(appId: String, nextScreen: String) {
+        val intent = Intent("org.commcare.dalvik.action.CommCareSession")
+        intent.putExtra(SESSION_ENDPOINT_APP_ID, appId)
+        var dispathActivity =
+            Robolectric.buildActivity(DispatchActivity::class.java, intent).create().resume().get()
+        var recordedNextIntent = Shadows.shadowOf(dispathActivity).nextStartedActivity
+        var intentActivityName: String = recordedNextIntent.component!!.className
+        assertEquals(nextScreen, intentActivityName)
+    }
+
     @Test
     fun testLaunchUsingSessionEndpoint() {
         // endpoint without arguments
@@ -67,7 +103,7 @@ class ExternalLaunchTests {
 
     private fun verifyNextIntent(nextIntent: Intent, header: String) {
         val intentActivityName: String = nextIntent.component!!.className
-        Assert.assertEquals(FormEntryActivity::class.java.name, intentActivityName)
+        assertEquals(FormEntryActivity::class.java.name, intentActivityName)
         assertEquals(nextIntent.extras!!.getString(FormEntryActivity.KEY_HEADER_STRING), header)
     }
 
diff --git a/app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java b/app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java
index 556b5bbfd2..4a1bc4fc5a 100644
--- a/app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java
+++ b/app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java
@@ -351,7 +351,16 @@ public class FormStorageTest {
             , "org.javarosa.core.util.externalizable.ExtWrapMultiMap"
             , "org.javarosa.core.model.instance.ExternalDataInstanceSource"
             , "org.commcare.suite.model.DetailGroup"
+            , "org.commcare.services.FCMMessageData"
             , "org.commcare.suite.model.EndpointArgument"
+            , "org.commcare.suite.model.EndpointAction"
+            , "org.commcare.suite.model.QueryGroup"
+            , "org.commcare.android.database.global.models.ConnectKeyRecord"
+            , "org.commcare.android.database.global.models.ConnectKeyRecordV6"
+
+            // Added in 2.55
+            , "org.javarosa.core.model.FormIndex"
+            , "org.commcare.models.database.InterruptedFormState"
     );
 
 
diff --git a/app/unit-tests/src/org/commcare/android/util/TestAppInstaller.java b/app/unit-tests/src/org/commcare/android/util/TestAppInstaller.java
index a28f16bbb6..10d5692a9f 100644
--- a/app/unit-tests/src/org/commcare/android/util/TestAppInstaller.java
+++ b/app/unit-tests/src/org/commcare/android/util/TestAppInstaller.java
@@ -91,12 +91,15 @@ private void installApp() {
                 new ApplicationRecord(PropertyUtils.genUUID().replace("-", ""),
                         ApplicationRecord.STATUS_UNINITIALIZED);
 
+
         CommCareApp app = new CommCareTestApp(new CommCareApp(newRecord));
+
         ResourceEngineTask<Object> task =
                 new ResourceEngineTask<Object>(app, -1, false, false) {
                     @Override
                     protected void deliverResult(Object receiver,
                                                  AppInstallStatus result) {
+                        app.setMMResourcesValidated();
                     }
 
                     @Override
diff --git a/app/unit-tests/src/org/commcare/android/util/TestUtils.java b/app/unit-tests/src/org/commcare/android/util/TestUtils.java
index 01e7c0712a..56697c5f94 100644
--- a/app/unit-tests/src/org/commcare/android/util/TestUtils.java
+++ b/app/unit-tests/src/org/commcare/android/util/TestUtils.java
@@ -20,7 +20,7 @@
 import org.commcare.models.database.SqlStorage;
 import org.commcare.models.database.user.DatabaseUserOpenHelper;
 import org.commcare.models.database.user.models.AndroidCaseIndexTable;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.modern.database.TableBuilder;
 import org.commcare.test.utilities.CaseTestUtils;
 import org.commcare.utils.AndroidInstanceInitializer;
@@ -47,7 +47,7 @@
 import org.javarosa.test_utils.ExprEvalUtils;
 import org.javarosa.xml.util.InvalidStructureException;
 import org.javarosa.xml.util.UnfullfilledRequirementsException;
-import org.robolectric.RuntimeEnvironment;
+import org.javarosa.xpath.parser.XPathSyntaxException;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -112,14 +112,14 @@ private static TransactionParserFactory getFactory(final SQLiteDatabase db, fina
                 //Note - this isn't even actually bulk processing. since this class is static
                 //there's no good lifecycle to manage the bulk processor in, but at least
                 //this will validate that the bulk processor works.
-                EntityStorageCache entityStorageCache = null;
+                CommCareEntityStorageCache commCareEntityStorageCache = null;
 
                 if (CommCareApplication.instance().getCurrentApp() != null) {
-                    entityStorageCache = new EntityStorageCache("case", db, AppUtils.getCurrentAppId());
+                    commCareEntityStorageCache = new CommCareEntityStorageCache("case", db, AppUtils.getCurrentAppId());
                 }
 
                 if (bulkProcessingEnabled) {
-                    return new AndroidBulkCaseXmlParser(parser, getCaseStorage(db), entityStorageCache, new AndroidCaseIndexTable(db)) {
+                    return new AndroidBulkCaseXmlParser(parser, getCaseStorage(db), commCareEntityStorageCache, new AndroidCaseIndexTable(db)) {
                         @Override
                         protected SQLiteDatabase getDbHandle() {
                             return db;
@@ -127,7 +127,7 @@ protected SQLiteDatabase getDbHandle() {
                     };
 
                 } else {
-                    return new AndroidCaseXmlParser(parser, getCaseStorage(db), entityStorageCache, new AndroidCaseIndexTable(db)) {
+                    return new AndroidCaseXmlParser(parser, getCaseStorage(db), commCareEntityStorageCache, new AndroidCaseIndexTable(db)) {
                         @Override
                         protected SQLiteDatabase getDbHandle() {
                             return db;
@@ -362,7 +362,7 @@ private static EvaluationContext buildContextWithInstances(UserSandbox sandbox,
         return new EvaluationContext(null, instances);
     }
 
-    public static void assertFormValue(String expr, Object expectedValue){
+    public static void assertFormValue(String expr, Object expectedValue) {
         FormDef formDef = FormEntryActivity.mFormController.getFormEntryController().getModel().getForm();
         FormInstance instance = formDef.getMainInstance();
 
@@ -370,4 +370,11 @@ public static void assertFormValue(String expr, Object expectedValue){
         errorMsg = ExprEvalUtils.expectedEval(expr, instance, null, expectedValue, null);
         assertTrue(errorMsg, "".equals(errorMsg));
     }
+
+    public static Object getFormValue(String expr) throws XPathSyntaxException {
+        FormDef formDef = FormEntryActivity.mFormController.getFormEntryController().getModel().getForm();
+        FormInstance instance = formDef.getMainInstance();
+        EvaluationContext ec = new EvaluationContext(instance);
+        return ExprEvalUtils.xpathEval(ec, expr);
+    }
 }
diff --git a/app/unit-tests/src/org/commcare/update/UpdateWorkerTest.kt b/app/unit-tests/src/org/commcare/update/UpdateWorkerTest.kt
index 9f2c89a2c6..903a4bdd8a 100644
--- a/app/unit-tests/src/org/commcare/update/UpdateWorkerTest.kt
+++ b/app/unit-tests/src/org/commcare/update/UpdateWorkerTest.kt
@@ -41,9 +41,8 @@ class UpdateWorkerTest {
     @Before
     fun setUp() {
         context = ApplicationProvider.getApplicationContext()
-        TestAppInstaller.installAppAndLogin(
-                UpdateUtils.buildResourceRef(REF_BASE_DIR, "base_app", "profile.ccpr"),
-                "test", "123")
+        TestAppInstaller.installApp(
+                UpdateUtils.buildResourceRef(REF_BASE_DIR, "base_app", "profile.ccpr"))
     }
 
     @Test
@@ -114,4 +113,4 @@ class UpdateWorkerTest {
                 .putString(PREFS_APP_SERVER_KEY, profileRef)
                 .apply()
     }
-}
\ No newline at end of file
+}
diff --git a/app/unit-tests/src/org/commcare/utils/DateRangeUtilsTest.java b/app/unit-tests/src/org/commcare/utils/DateRangeUtilsTest.java
deleted file mode 100644
index d16f05b7d9..0000000000
--- a/app/unit-tests/src/org/commcare/utils/DateRangeUtilsTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.commcare.utils;
-
-import org.junit.Test;
-
-import java.text.ParseException;
-
-import androidx.core.util.Pair;
-
-public class DateRangeUtilsTest {
-
-    @Test
-    public void testDateConversion() throws ParseException {
-        String dateRange = "2020-02-15 to 2021-03-18";
-        Pair<Long, Long> selection = DateRangeUtils.parseHumanReadableDate(dateRange);
-        String startDate = DateRangeUtils.getDateFromTime(selection.first);
-        String endDate = DateRangeUtils.getDateFromTime(selection.second);
-        String humanReadableDateRange = DateRangeUtils.getHumanReadableDateRange(startDate, endDate);
-        assert dateRange.contentEquals(humanReadableDateRange);
-        assert DateRangeUtils.formatDateRangeAnswer(startDate, endDate).contentEquals("__range__2020-02-15__2021-03-18");
-    }
-
-}
diff --git a/build.gradle b/build.gradle
index 452d538b1c..3eb760f227 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,16 @@
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'org.jacoco:org.jacoco.core:0.8.8'
+        classpath 'org.jacoco:org.jacoco.core:0.8.10'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
     }
 }
@@ -25,7 +24,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 }
 
diff --git a/commcare-support-library/README.md b/commcare-support-library/README.md
index df08fce73b..555ff0b1f3 100644
--- a/commcare-support-library/README.md
+++ b/commcare-support-library/README.md
@@ -58,3 +58,9 @@ Then retrieve the XML for a specific fixture from this list:
 
 `FixtureUtils.getFixtureXml(Context context, String fixtureId`
 
+#### CommCare Launch Helpers
+
+Launch CommCare with a specific CommCare App:
+
+`CommCareLauncher.launchCommCareForAppId(Context context, String appId)`
+
diff --git a/commcare-support-library/build.gradle b/commcare-support-library/build.gradle
index cb15028124..652b537f70 100644
--- a/commcare-support-library/build.gradle
+++ b/commcare-support-library/build.gradle
@@ -39,11 +39,12 @@ afterEvaluate {
 }
 
 android {
-    compileSdkVersion 30
+    namespace "org.commcare.commcaresupportlibrary"
+    compileSdk 35
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 34
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -51,13 +52,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
diff --git a/commcare-support-library/src/main/AndroidManifest.xml b/commcare-support-library/src/main/AndroidManifest.xml
index f572a4257e..568741e54f 100644
--- a/commcare-support-library/src/main/AndroidManifest.xml
+++ b/commcare-support-library/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.commcare.commcaresupportlibrary" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/CommCareLauncher.java b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/CommCareLauncher.java
new file mode 100644
index 0000000000..4dbbb8575a
--- /dev/null
+++ b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/CommCareLauncher.java
@@ -0,0 +1,23 @@
+package org.commcare.commcaresupportlibrary;
+
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Utility class with methods to launch CommCare
+ */
+public class CommCareLauncher {
+    public static final String SESSION_ENDPOINT_APP_ID = "ccodk_session_endpoint_app_id";
+    private static final String CC_LAUNCH_ACTION = "org.commcare.dalvik.action.CommCareSession";
+
+    /**
+     *
+     * @param context Android context to launch the CommCare with
+     * @param appId Unique Id for CommCare App that CommCare should launch with
+     */
+    public static void launchCommCareForAppId(Context context, String appId) {
+        Intent intent = new Intent(CC_LAUNCH_ACTION);
+        intent.putExtra(SESSION_ENDPOINT_APP_ID, appId);
+        context.startActivity(intent);
+    }
+}
diff --git a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/BiometricIdentifier.java b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/BiometricIdentifier.java
new file mode 100644
index 0000000000..637c6d599c
--- /dev/null
+++ b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/BiometricIdentifier.java
@@ -0,0 +1,25 @@
+package org.commcare.commcaresupportlibrary.identity;
+
+public enum BiometricIdentifier {
+    RIGHT_THUMB("right_thumb_template"),
+    RIGHT_INDEX_FINGER("right_index_finger_template"),
+    RIGHT_MIDDLE_FINGER("right_middle_finger_template"),
+    RIGHT_RING_FINGER("right_ring_finger_template"),
+    RIGHT_PINKY_FINGER("right_pinky_finger_template"),
+    LEFT_THUMB("left_thumb_template"),
+    LEFT_INDEX_FINGER("left_index_finger_template"),
+    LEFT_MIDDLE_FINGER("left_middle_finger_template"),
+    LEFT_RING_FINGER("left_ring_finger_template"),
+    LEFT_PINKY_FINGER("left_pinky_finger_template"),
+    FACE("face_template");
+
+    private final String calloutResponseKey;
+
+    BiometricIdentifier(String calloutResponseKey) {
+        this.calloutResponseKey = calloutResponseKey;
+    }
+
+    public String getCalloutResponseKey() {
+        return calloutResponseKey;
+    }
+}
diff --git a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/IdentityResponseBuilder.java b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/IdentityResponseBuilder.java
index a69f758bc4..e8cfd628c2 100644
--- a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/IdentityResponseBuilder.java
+++ b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/IdentityResponseBuilder.java
@@ -9,6 +9,7 @@
 import org.commcare.commcaresupportlibrary.identity.model.VerificationMatch;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -41,6 +42,18 @@ public static IdentityResponseBuilder registrationResponse(String guid) {
         return new IdentityResponseBuilder(intent);
     }
 
+    /**
+     * Creates response for result of a new Identity Registration with biometric templates
+     *
+     * @param templates data captured as part of the new registration in the Identity Provider
+     * @return IdentityResponseBuilder for a registration workflow response
+     */
+    public static IdentityResponseBuilder registrationResponse(String guid, Map<BiometricIdentifier, byte[]> templates) {
+        Intent intent = new Intent();
+        intent.putExtra(REGISTRATION, new RegistrationResult(guid, templates));
+        return new IdentityResponseBuilder(intent);
+    }
+
     /**
      * Creates response for result of a identification workflow
      *
diff --git a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/identity_integration.md b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/identity_integration.md
index ea34dd3ec9..51b48638cb 100644
--- a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/identity_integration.md
+++ b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/identity_integration.md
@@ -20,7 +20,17 @@ Often you will need this generated guid to be passed back to CommCare so that it
 IdentityResponseBuilder.registrationResponse(guid)
     .finalizeResponse(activity)
 ````
-
+Alternatively, in case the biometric templates are to be stored in CommCare, use the following instead:
+````
+IdentityResponseBuilder.registrationResponse(guid, templates)
+    .finalizeResponse(activity)
+````
+* `templates` is a [`Map`](https://docs.oracle.com/javase/8/docs/api/java/util/Map.html) containing all the biometric templates and whose _keys_ are [`BiometricIdentifier`](BiometricIdentifier.java) elements and _values_ are the actual biometric templates in the form of a byte array. See an example below in `kotlin`:
+````
+        var templates: HashMap<BiometricIdentifier, ByteArray> = HashMap(2)
+        templates[BiometricIdentifier.LEFT_INDEX_FINGER] = byteArrayOf(0, 0, -21, -67, 0, -64, 25, 62, -69, -124, -91, 29, -50, -107, 58)
+        templates[BiometricIdentifier.LEFT_MIDDLE_FINGER] = byteArrayOf(122, -91, 114, 62, 107, -95, -69, 28, 110, 123, 72, 71, -86, -117, 126)
+````
 This creates an appropriate resulting Intent for the Identity registration workflow and finish your activity after setting the response as a result to returning intent.
 
 
diff --git a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/model/RegistrationResult.java b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/model/RegistrationResult.java
index fe16353e6c..11e4b2e135 100644
--- a/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/model/RegistrationResult.java
+++ b/commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/identity/model/RegistrationResult.java
@@ -3,10 +3,16 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import org.commcare.commcaresupportlibrary.identity.BiometricIdentifier;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
 @SuppressWarnings("unused")
 public class RegistrationResult implements Parcelable {
-
     private String guid;
+    private Map<BiometricIdentifier, byte[]> templates;
 
     /**
      * Result of the identity enrollment workflow
@@ -15,10 +21,25 @@ public class RegistrationResult implements Parcelable {
      */
     public RegistrationResult(String guid) {
         this.guid = guid;
+        this.templates = new HashMap<>(0);
+    }
+
+    public RegistrationResult(String guid, Map<BiometricIdentifier, byte[]> templates) {
+        this.guid = guid;
+        this.templates = templates;
     }
 
     protected RegistrationResult(Parcel in) {
         guid = in.readString();
+        int numTemplates = in.readInt();
+        templates = new HashMap<>(numTemplates);
+        for (int i=0;i < numTemplates; i++){
+            BiometricIdentifier biometricIdentifier = BiometricIdentifier.values()[in.readInt()];
+            int templateSize = in.readInt();
+            byte[] template = new byte[templateSize];
+            in.readByteArray(template);
+            templates.put(biometricIdentifier, template);
+        }
     }
 
     public static final Creator<RegistrationResult> CREATOR = new Creator<RegistrationResult>() {
@@ -41,12 +62,26 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(guid);
+        dest.writeInt(getNumberOfTemplates());
+        for (Map.Entry<BiometricIdentifier, byte[]> template : templates.entrySet()){
+            dest.writeInt(template.getKey().ordinal());
+            dest.writeInt(template.getValue().length);
+            dest.writeByteArray(template.getValue());
+        }
     }
 
     public String getGuid() {
         return guid;
     }
 
+    public Map<BiometricIdentifier, byte[]> getTemplates() {
+        return templates;
+    }
+
+    public int getNumberOfTemplates() {
+        return templates.size();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == this) {
@@ -59,12 +94,25 @@ public boolean equals(Object o) {
         if (!guid.equals(other.guid)) {
             return false;
         }
+        if (getNumberOfTemplates() != other.getNumberOfTemplates()){
+            return false;
+        }
+
+        for (Map.Entry<BiometricIdentifier, byte[]> template : templates.entrySet()){
+            byte[] otherTemplate = other.getTemplates().get(template.getKey());
+            if (!Arrays.equals(template.getValue(), otherTemplate)) {
+                return false;
+            }
+        }
         return true;
     }
 
     @Override
     public int hashCode() {
         int hash = guid.hashCode();
+        for (Map.Entry<BiometricIdentifier, byte[]> template : templates.entrySet()){
+            hash += Arrays.hashCode(template.getValue());
+        }
         return hash;
     }
 }
diff --git a/commcare-support-library/src/main/res/layout/activity_main.xml b/commcare-support-library/src/main/res/layout/activity_main.xml
index 19e93d31e5..a2e8bd72a5 100644
--- a/commcare-support-library/src/main/res/layout/activity_main.xml
+++ b/commcare-support-library/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,4 +16,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>
diff --git a/gradle.properties b/gradle.properties
index 8a9ce1ad11..030bb06fa1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,4 +21,10 @@ org.gradle.configureondemand=false
 android.useAndroidX=true
 
 # automatically migrates existing third-party libraries to use AndroidX by rewriting their binaries
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+
+# generate R classes with final fields
+android.nonFinalResIds=false
+
+# Enables Gradle Configuration Cache to improve build performance
+org.gradle.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 51cec56f04..7dc64c5911 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Feb 10 10:17:15 SAST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME