diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 96b54a39a2..4fac7c8ddd 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.commcare.dalvik"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:versionCode="106"
-          android:versionName="2.55">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.commcare.dalvik"
+    android:versionCode="106"
+    android:versionName="2.55">
 
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -20,74 +20,64 @@
     <uses-permission
         xmlns:android="http://schemas.android.com/apk/res/android"
         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"/>
-    <!-- required to ensure app compatibility -->
+        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" /> <!-- required to ensure app compatibility -->
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"/>
+        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.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.NEARBY_WIFI_DEVICES"
+        android:usesPermissionFlags="neverForLocation" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature
         android:name="android.hardware.telephony"
-        android:required="false"/>
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.location"
-        android:required="false"/>
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.location.gps"
-        android:required="false"/>
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.location.network"
-        android:required="false"/>
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false"/>
-
-    <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.appmattus.certificatetransparency"/>
+        android:required="false" />
 
     <permission-group
         android:name="commcare.permission-group.DATABASE"
         android:description="@string/permission_content_provider_description"
-        android:label="@string/permission_content_provider_label"
-        />
-
+        android:label="@string/permission_content_provider_label" />
     <permission-group
         android:name="commcare.permission-group.EXTERNAL_ACTION"
         android:description="@string/permission_external_action_description"
-        android:label="@string/permission_external_action_label"
-        />
+        android:label="@string/permission_external_action_label" />
 
     <permission
+        android:name="${applicationId}.provider.cases.read"
         android:description="@string/permission_content_provider_description"
         android:label="@string/permission_content_provider_label"
-        android:name="${applicationId}.provider.cases.read"
         android:permissionGroup="commcare.permission-group.DATABASE"
-        android:protectionLevel="dangerous">
-    </permission>
-
+        android:protectionLevel="dangerous"></permission>
     <permission
         android:name="${applicationId}.permission.COMMCARE_LOGOUT"
         android:description="@string/permission_commcare_logout_description"
         android:label="@string/permission_commcare_logout_label"
         android:permissionGroup="commcare.permission-group.EXTERNAL_ACTION"
-        android:protectionLevel="dangerous">
-    </permission>
+        android:protectionLevel="dangerous"></permission>
 
     <queries>
         <intent>
@@ -95,12 +85,17 @@
         </intent>
         <intent>
             <action android:name="android.intent.action.SEND" />
+
             <data android:mimeType="*/*" />
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="*/*" android:scheme="*" />
+
+            <data
+                android:mimeType="*/*"
+                android:scheme="*" />
         </intent>
+
         <package android:name="com.google.android.apps.maps" />
         <package android:name="org.commcare.dalvik.reminders" />
         <package android:name="callout.commcare.org.sendussd" />
@@ -108,16 +103,16 @@
     </queries>
 
     <application
-        android:allowBackup="false"
-        tools:replace="android:label,android:icon,android:theme, android:allowBackup"
         android:name="org.commcare.CommCareApplication"
+        android:allowBackup="false"
+        android:enableOnBackInvokedCallback="false"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/commcare_launcher"
-        android:supportsRtl="true"
         android:label="@string/application_name"
-        android:hardwareAccelerated="true"
-        android:usesCleartextTraffic="true"
+        android:supportsRtl="true"
         android:theme="@style/AppBaseTheme"
-        android:enableOnBackInvokedCallback="false">
+        android:usesCleartextTraffic="true"
+        tools:replace="android:label,android:icon,android:theme, android:allowBackup">
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
@@ -132,34 +127,33 @@
         </receiver>
 
         <activity
-            android:label="@string/application_name"
+            android:name="org.commcare.activities.DispatchActivity"
             android:exported="true"
-            android:name="org.commcare.activities.DispatchActivity">
+            android:label="@string/application_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.commcare.dalvik.action.CommCareSession"/>
+                <action android:name="org.commcare.dalvik.action.CommCareSession" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/manager_activity_name"
-            android:exported="true"
             android:name="org.commcare.activities.AppManagerActivity"
+            android:exported="true"
+            android:label="@string/manager_activity_name"
             android:taskAffinity="org.commcare.Manage">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/application_name"
             android:name="org.commcare.activities.LoginActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:label="@string/application_name"
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:label="CommCare Forced Closure"
             android:name="org.commcare.activities.CrashWarningActivity">
@@ -188,24 +182,24 @@
 
         <provider
             android:name="org.commcare.provider.FormsProvider"
-            android:exported="false"
-            android:authorities="${odkProvider}.forms"/>
+            android:authorities="${odkProvider}.forms"
+            android:exported="false" />
         <provider
             android:name="org.commcare.provider.InstanceProvider"
-            android:exported="false"
-            android:authorities="${odkProvider}.instances"/>
+            android:authorities="${odkProvider}.instances"
+            android:exported="false" />
         <provider
+            android:name="org.commcare.provider.CaseDataContentProvider"
             android:authorities="${applicationId}.case"
             android:enabled="true"
             android:exported="true"
-            android:name="org.commcare.provider.CaseDataContentProvider"
-            android:readPermission="${applicationId}.provider.cases.read"/>
+            android:readPermission="${applicationId}.provider.cases.read" />
         <provider
+            android:name="org.commcare.provider.FixtureDataContentProvider"
             android:authorities="${applicationId}.fixture"
             android:enabled="true"
             android:exported="true"
-            android:name="org.commcare.provider.FixtureDataContentProvider"
-            android:readPermission="${applicationId}.provider.cases.read"/>
+            android:readPermission="${applicationId}.provider.cases.read" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.external.files.provider"
@@ -213,229 +207,200 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
         </provider>
 
         <activity
             android:name="org.commcare.activities.CommCarePreferenceActivity"
-            android:theme="@style/PreferenceTheme">
-        </activity>
+            android:theme="@style/PreferenceTheme"></activity>
         <activity
             android:name="org.commcare.activities.SessionAwarePreferenceActivity"
-            android:theme="@style/PreferenceTheme">
-        </activity>
+            android:theme="@style/PreferenceTheme"></activity>
         <activity
             android:name="org.commcare.activities.FullscreenVideoViewActivity"
-            android:theme="@style/FullscreenTheme">
-        </activity>
+            android:theme="@style/FullscreenTheme"></activity>
         <activity
-            android:exported="false"
-            android:name="org.commcare.activities.DotsEntryActivity">
+            android:name="org.commcare.activities.DotsEntryActivity"
+            android:exported="false">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.action.DotsEntry"/>
+                <action android:name="org.commcare.dalvik.action.DotsEntry" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="org.commcare.activities.CallOutActivity">
-        </activity>
+        <activity android:name="org.commcare.activities.CallOutActivity"></activity>
         <activity
             android:name="org.commcare.activities.CommCareSetupActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http"/>
-                <data android:scheme="https"/>
-                <data android:host="*"/>
-                <data android:mimeType="commcare/profile"/>
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="*" />
+                <data android:mimeType="commcare/profile" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http"/>
-                <data android:host="*"/>
-                <data android:pathPattern=".*\\.ccpr"/>
+                <data android:scheme="http" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.ccpr" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https"/>
-                <data android:host="*"/>
-                <data android:pathPattern=".*\\.ccpr"/>
+                <data android:scheme="https" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.ccpr" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:scheme="file"/>
-                <data android:host="*"/>
-                <data android:pathPattern=".*\\.ccpr"/>
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.ccpr" />
             </intent-filter>
             <intent-filter android:icon="@mipmap/commcare_launcher">
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
                     android:host="*"
                     android:mimeType="*/*"
                     android:pathPattern=".*\\.ccz"
-                    android:scheme="file"/>
+                    android:scheme="file" />
             </intent-filter>
             <intent-filter android:icon="@mipmap/commcare_launcher">
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:scheme="file"/>
-                <data android:host="*"/>
-                <data android:pathPattern=".*\\.ccz"/>
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.ccz" />
             </intent-filter>
         </activity>
         <activity
             android:name="org.commcare.activities.UpdateActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.SingleAppManagerActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.EntitySelectActivity"
-            android:windowSoftInputMode="stateUnchanged|adjustResize">
-        </activity>
-        <activity android:name="org.commcare.activities.CommCareGraphActivity">
-        </activity>
+            android:windowSoftInputMode="stateUnchanged|adjustResize"></activity>
+        <activity android:name="org.commcare.activities.CommCareGraphActivity"></activity>
         <activity
             android:name="org.commcare.activities.EntityDetailActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.FormRecordListActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
 
         <service
-            android:enabled="true"
-            android:name="org.commcare.services.CommCareSessionService">
-        </service>
+            android:name="org.commcare.services.CommCareSessionService"
+            android:enabled="true"></service>
 
         <activity
-            android:launchMode="singleTop"
             android:name="org.commcare.activities.FormEntryActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.DrawActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.FormHierarchyActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.GeoPointActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.GeoPointMapActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.InstallArchiveActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
-
-        <activity android:name="org.commcare.gis.EntityMapActivity">
-        </activity>
-
-        <activity android:name="org.commcare.gis.EntityMapboxActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-        </activity>
-
+            android:windowSoftInputMode="adjustResize"></activity>
+        <activity android:name="org.commcare.gis.EntityMapActivity"></activity>
+        <activity
+            android:name="org.commcare.gis.EntityMapboxActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"></activity>
         <activity
             android:name="org.commcare.gis.DrawingBoundaryActivity"
             android:exported="false"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.action.DrawBoundary"/>
+                <action android:name="org.commcare.dalvik.action.DrawBoundary" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <activity android:name="org.commcare.activities.RefreshToLatestBuildActivity">
-        </activity>
-        <activity android:name="org.commcare.activities.MultipleAppsLimitWarningActivity">
-        </activity>
-        <activity android:name="org.commcare.activities.GlobalPrivilegeClaimingActivity">
-        </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.activities.RefreshToLatestBuildActivity"></activity>
+        <activity android:name="org.commcare.activities.MultipleAppsLimitWarningActivity"></activity>
+        <activity android:name="org.commcare.activities.GlobalPrivilegeClaimingActivity"></activity>
+        <activity android:name="org.commcare.activities.InstallFromListActivity"></activity>
+        <activity
+            android:name="org.commcare.gis.MapboxLocationPickerActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
 
         <uses-library
             android:name="com.google.android.maps"
-            android:required="false"/>
+            android:required="false" />
 
-        <activity android:name="org.commcare.activities.MessageActivity">
-        </activity>
+        <activity android:name="org.commcare.activities.MessageActivity"></activity>
 
-        <receiver android:name="org.commcare.views.notifications.NotificationClearReceiver">
-        </receiver>
+        <receiver android:name="org.commcare.views.notifications.NotificationClearReceiver"></receiver>
 
         <activity
-            android:label="@string/title_activity_report_problem"
-            android:name="org.commcare.activities.ReportProblemActivity">
+            android:name="org.commcare.activities.ReportProblemActivity"
+            android:label="@string/title_activity_report_problem">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.commcare.activities.CommCareSetupActivity"/>
+                android:value="org.commcare.activities.CommCareSetupActivity" />
         </activity>
         <activity
             android:name="org.commcare.activities.CommCareVerificationActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
-        <activity android:name="org.commcare.activities.UnrecoverableErrorActivity">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
+        <activity android:name="org.commcare.activities.UnrecoverableErrorActivity"></activity>
         <activity
-            android:exported="true"
-            android:name="org.commcare.activities.KeyAccessRequestActivity">
+            android:name="org.commcare.activities.KeyAccessRequestActivity"
+            android:exported="true">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.action.CommCareKeyAccessRequest"/>
+                <action android:name="org.commcare.dalvik.action.CommCareKeyAccessRequest" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-            android:exported="false"
-            android:name="org.commcare.android.nfc.NfcWriteActivity">
+            android:name="org.commcare.android.nfc.NfcWriteActivity"
+            android:exported="false">
             <intent-filter>
-                <action android:name="org.commcare.nfc.WRITE"/>
+                <action android:name="org.commcare.nfc.WRITE" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-            android:exported="false"
-            android:name="org.commcare.android.nfc.NfcReadActivity">
+            android:name="org.commcare.android.nfc.NfcReadActivity"
+            android:exported="false">
             <intent-filter>
-                <action android:name="org.commcare.nfc.READ"/>
+                <action android:name="org.commcare.nfc.READ" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
@@ -443,156 +408,144 @@
             android:name="org.commcare.provider.ExternalApiReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.ExternalAction"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="org.commcare.dalvik.api.action.ExternalAction" />
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-
         <receiver
-            android:exported="true"
             android:name="org.commcare.provider.CommCareLogoutReceiver"
+            android:exported="true"
             android:permission="org.commcare.dalvik.permission.COMMCARE_LOGOUT">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.CommCareLogoutAction"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="org.commcare.dalvik.api.action.CommCareLogoutAction" />
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-
         <receiver
             android:name="org.commcare.provider.RefreshToLatestBuildReceiver"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.RefreshToLatestBuildAction"/>
+                <action android:name="org.commcare.dalvik.api.action.RefreshToLatestBuildAction" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
         <receiver
             android:name="org.commcare.provider.DebugControlsReceiver"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.SessionCaptureAction"/>
+                <action android:name="org.commcare.dalvik.api.action.SessionCaptureAction" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.UninstallApp"/>
+                <action android:name="org.commcare.dalvik.api.action.UninstallApp" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.LoginWithCreds"/>
+                <action android:name="org.commcare.dalvik.api.action.LoginWithCreds" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.TriggerSyncRecover"/>
+                <action android:name="org.commcare.dalvik.api.action.TriggerSyncRecover" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.ClearCacheOnRestore"/>
+                <action android:name="org.commcare.dalvik.api.action.ClearCacheOnRestore" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.commcare.dalvik.api.action.ExpireUserKeyRecord"/>
+                <action android:name="org.commcare.dalvik.api.action.ExpireUserKeyRecord" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="${applicationId}.api.action.SetImageWidgetPath"/>
+                <action android:name="${applicationId}.api.action.SetImageWidgetPath" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
 
-        <activity android:name="org.commcare.activities.MultimediaInflaterActivity">
-        </activity>
+        <activity android:name="org.commcare.activities.MultimediaInflaterActivity"></activity>
         <activity
             android:name="org.commcare.activities.CommCareFormDumpActivity"
-            android:windowSoftInputMode="adjustPan">
-        </activity>
+            android:windowSoftInputMode="adjustPan"></activity>
         <activity
             android:name="org.commcare.activities.ConnectionDiagnosticActivity"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
+            android:windowSoftInputMode="adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.CommCareWiFiDirectActivity"
-            android:screenOrientation="portrait">
-        </activity>
-        <activity android:name="org.commcare.activities.RecoveryActivity">
-        </activity>
+            android:screenOrientation="portrait"></activity>
+        <activity android:name="org.commcare.activities.RecoveryActivity"></activity>
         <activity
             android:name="org.commcare.print.TemplatePrinterActivity"
             android:exported="false"
             android:theme="@style/Theme.Dialog.NoTitle">
             <intent-filter>
-                <action android:name="org.commcare.dalvik.action.PRINT"/>
+                <action android:name="org.commcare.dalvik.action.PRINT" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <activity android:name="org.commcare.activities.SeatAppActivity"/>
-        <activity android:name="org.commcare.activities.PostRequestActivity"/>
-        <activity android:name="org.commcare.activities.QueryRequestActivity"/>
+        <activity android:name="org.commcare.activities.SeatAppActivity" />
+        <activity android:name="org.commcare.activities.PostRequestActivity" />
+        <activity android:name="org.commcare.activities.QueryRequestActivity" />
         <activity
             android:name="org.commcare.activities.CreatePinActivity"
-            android:windowSoftInputMode="stateVisible|adjustResize">
-        </activity>
+            android:windowSoftInputMode="stateVisible|adjustResize"></activity>
         <activity
             android:name="org.commcare.activities.PinAuthenticationActivity"
-            android:windowSoftInputMode="stateVisible|adjustResize">
-        </activity>
-        <activity android:name="org.commcare.activities.PromptApkUpdateActivity"/>
-        <activity android:name="org.commcare.activities.PromptCczUpdateActivity"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"></activity>
+        <activity android:name="org.commcare.activities.PromptApkUpdateActivity" />
+        <activity android:name="org.commcare.activities.PromptCczUpdateActivity" />
         <activity
-            android:label="@string/title_data_change_logs_activity"
+            android:name="org.commcare.activities.DataChangeLogsActivity"
             android:exported="false"
-            android:name="org.commcare.activities.DataChangeLogsActivity">
+            android:label="@string/title_data_change_logs_activity">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
-        <activity android:name="org.commcare.activities.TargetMismatchErrorActivity"/>
-        <activity android:name="org.commcare.recovery.measures.ExecuteRecoveryMeasuresActivity"/>
-        <activity android:name="org.commcare.activities.PromptCCReinstallActivity"/>
-        <!-- Start Collect Manifest -->
-
+        <activity android:name="org.commcare.activities.TargetMismatchErrorActivity" />
+        <activity android:name="org.commcare.recovery.measures.ExecuteRecoveryMeasuresActivity" />
+        <activity android:name="org.commcare.activities.PromptCCReinstallActivity" /> <!-- Start Collect Manifest -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="${googlePlayMapsApiKey}"/>
+            android:value="${googlePlayMapsApiKey}" />
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
+            android:value="@integer/google_play_services_version" />
         <meta-data
             android:name="android.content.APP_RESTRICTIONS"
-            android:resource="@xml/app_restrictions"/>
-
-
-        <activity android:name="org.commcare.activities.CommcareListActivity"/>
+            android:resource="@xml/app_restrictions" />
 
-        <!-- This is to disable fabric for debug builds properly - https://stackoverflow.com/a/49836972/3811963 -->
+        <activity android:name="org.commcare.activities.CommcareListActivity" /> <!-- This is to disable fabric for debug builds properly - https://stackoverflow.com/a/49836972/3811963 -->
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="false" />
-
-        <!-- Somehow this receiver is getting triggered in Android 8+ devices and causing
+        <!--
+ Somehow this receiver is getting triggered in Android 8+ devices and causing
             IllegalStateException while trying to start map downloader service from background.
             Below code removes this receiver's entry from Manifest.
-         -->
-        <receiver android:name="io.ona.kujaku.receivers.KujakuNetworkChangeReceiver"
-            tools:node="remove"/>
-
-        <!-- The zebra-print-android library is not yet targeting Android 12 and at least one
+        -->
+        <receiver
+            android:name="io.ona.kujaku.receivers.KujakuNetworkChangeReceiver"
+            tools:node="remove" />
+        <!--
+ The zebra-print-android library is not yet targeting Android 12 and at least one
             Activity doesn't have the required attribute exported. The entry below adds the
             attribute to the final Manifest.
         -->
         <activity
-            android:exported="true"
             android:name="com.dimagi.android.zebraprinttool.PrintReceiverActivity"
-            tools:node="merge"/>
+            android:exported="true"
+            tools:node="merge" />
 
         <service
             android:name="org.commcare.services.CommCareFirebaseMessagingService"
@@ -601,7 +554,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/res/drawable/arow_icon.png b/app/res/drawable/arow_icon.png
new file mode 100644
index 0000000000..7255d45c1e
Binary files /dev/null and b/app/res/drawable/arow_icon.png differ
diff --git a/app/res/drawable/commcare_diamgi_logo.png b/app/res/drawable/commcare_diamgi_logo.png
new file mode 100644
index 0000000000..73205b4c90
Binary files /dev/null and b/app/res/drawable/commcare_diamgi_logo.png differ
diff --git a/app/res/drawable/dialpad.png b/app/res/drawable/dialpad.png
new file mode 100644
index 0000000000..cae8bacdbe
Binary files /dev/null and b/app/res/drawable/dialpad.png differ
diff --git a/app/res/drawable/grey_small_button.xml b/app/res/drawable/grey_small_button.xml
new file mode 100644
index 0000000000..0de12b63d4
--- /dev/null
+++ b/app/res/drawable/grey_small_button.xml
@@ -0,0 +1,18 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="135dp"
+    android:height="40dp"
+    android:viewportWidth="135"
+    android:viewportHeight="40"
+    >
+    <group>
+        <clip-path
+            android:pathData="M20 0H115C126.046 0 135 8.95431 135 20C135 31.0457 126.046 40 115 40H20C8.95431 40 0 31.0457 0 20C0 8.95431 8.95431 0 20 0Z"
+            />
+        <path
+            android:pathData="M0 0V40H135V0"
+            android:fillColor="#D9D9D9"
+            />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/res/drawable/lock.png b/app/res/drawable/lock.png
new file mode 100644
index 0000000000..dd2e8b48f6
Binary files /dev/null and b/app/res/drawable/lock.png differ
diff --git a/app/res/drawable/rounded_rect.xml b/app/res/drawable/rounded_rect.xml
new file mode 100644
index 0000000000..5bc899c501
--- /dev/null
+++ b/app/res/drawable/rounded_rect.xml
@@ -0,0 +1,13 @@
+<!-- res/drawable/rounded_background.xml -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#09666666"/> <!-- Background color, white in this case -->
+    <corners android:radius="16dp"/> <!-- Adjust the radius as needed -->
+    <padding
+        android:left="16dp"
+        android:top="16dp"
+        android:right="16dp"
+        android:bottom="16dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#09666666"/> <!-- Border color -->
+</shape>
diff --git a/app/res/values-fr/strings.xml b/app/res/values-fr/strings.xml
index 39db1c83c9..aaf4450a44 100644
--- a/app/res/values-fr/strings.xml
+++ b/app/res/values-fr/strings.xml
@@ -203,13 +203,10 @@ License.
     <string name="connect_results_summary_verifications_title">Statut de vérification</string>
     <string name="connect_results_summary_verifications_description">Vérification en attente: %d\nNot Approved: %d\Approved: %d</string>
     <string name="connect_results_summary_payments_title">Statut de paiement</string>
-    <string name="connect_results_summary_payments_description">Montant gagné: %s\nMontant transféré: %s</string>
     <string name="connect_results_payment_description">Payé %s</string>
     <string name="connect_results_payment_confirmed">Confirmé</string>
     <string name="connect_results_payment_not_confirmed">Non confirmé</string>
     <string name="connect_results_payment_date">Émis %s</string>
-
-
     <string name="connect_last_update">Mis à jour: %s</string>
     <string name="connect_job_none_training">Vous ne suivez aucune formation pour un emploi pour le moment</string>
     <string name="connect_job_none_active">Vous n\'avez aucun emploi actif pour le moment</string>
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 5f9214660f..dde7ec7d5d 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -146,4 +146,6 @@
     <!-- Button colors -->
     <color name="button_primary">#005ab2</color>
     <color name="button_disabled">#d0e3ff</color>
+
+    <color name="pattern_color">#1c1b1f</color>
 </resources>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index 215ec6e8c0..7e9d845a25 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -91,7 +91,7 @@
     <string name="expirenotification">CommCare Login Expired</string>
     <string name="submission_notification_title">Submitting Data</string>
     <string name="submission_logs_title">Submitting CommCare Logs</string>
-    <string name="remote_form_payload_url"/>
+    <string name="remote_form_payload_url" />
 
     <item name="login_screen_hide_all_cuttoff" type="integer">200</item>
     <item name="login_screen_hide_banner_cuttoff" type="integer">250</item>
@@ -467,7 +467,7 @@
     <string name="area_format" cc:translatable="true">%1s sq m</string>
     <string name="parse_coordinates_failure" cc:translatable="true">Could not parse input coordinates</string>
     <string name="location_provider_disabled" cc:translatable="true">Turn on your location to receive location updates</string>
-    <string name="wait_for_location_fix"  cc:translatable="true">CommCare is still trying to get your location. Please wait or click Cancel to abort.</string>
+    <string name="wait_for_location_fix" cc:translatable="true">CommCare is still trying to get your location. Please wait or click Cancel to abort.</string>
     <string name="invalid_case_property_length" cc:translatable="true">Invalid %1s, value must be 255 characters or less</string>
     <string name="invalid_case_graph_error" cc:translatable="true">This form introduces an invalid case relationship</string>
     <string name="root_detected_title" cc:translatable="true">Rooted Device Detected</string>
@@ -786,7 +786,7 @@
     <string name="login_menu_connect_sign_in">Sign up for ConnectID</string>
     <string name="login_menu_connect_sign_out">Sign out of ConnectID</string>
     <string name="login_menu_connect_forget">Forget ConnectID user</string>
-  
+
     <string name="connect_app_install_unknown_error">App install failed due to an unknown error</string>
     <string name="connect_app_installed">App installed</string>
     <string name="app_with_id_not_found">Required CommCare App is not installed on device</string>
@@ -797,4 +797,8 @@
     <string name="user_suspended">User is Suspended. Please contact admin.</string>
     <string name="select_phone_number">Select Phone Number</string>
     <string name="connect_job_list_api_failure">An error occurred while connecting to the server.</string>
+    <string name="app_lock">App Lock</string>
+    <string name="unlock_with_biometric">Unlock with biometric</string>
+    <string name="set_up_pin">Setup 6 Digit PIN</string>
+    <string name="unlock_with_biometric_text">When enabled, you’ll need to use fingerprint, face or other unique identifiers to open the CommCare App</string>
 </resources>
diff --git a/app/src/org/commcare/activities/LoginActivity.java b/app/src/org/commcare/activities/LoginActivity.java
index e677c21bbb..9a0d821152 100644
--- a/app/src/org/commcare/activities/LoginActivity.java
+++ b/app/src/org/commcare/activities/LoginActivity.java
@@ -17,6 +17,8 @@
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.biometric.BiometricManager;
+import androidx.biometric.BiometricPrompt;
 import androidx.core.app.ActivityCompat;
 import androidx.core.util.Pair;
 import androidx.preference.PreferenceManager;
@@ -51,6 +53,7 @@
 import org.commcare.tasks.ManageKeyRecordTask;
 import org.commcare.tasks.PullTaskResultReceiver;
 import org.commcare.tasks.ResultAndError;
+import org.commcare.utils.BiometricsHelper;
 import org.commcare.utils.ConsumerAppsUtil;
 import org.commcare.utils.CrashUtil;
 import org.commcare.utils.Permissions;
@@ -112,6 +115,10 @@ public class LoginActivity extends CommCareActivity<LoginActivity>
     private String presetAppId;
     private boolean appLaunchedFromConnect;
     private boolean connectLaunchPerformed;
+    private BiometricPrompt.AuthenticationCallback biometricPromptCallbacks;
+    private BiometricManager biometricManager;
+
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -134,6 +141,8 @@ protected void onCreate(Bundle savedInstanceState) {
         presetAppId = getIntent().getStringExtra(EXTRA_APP_ID);
         appLaunchedFromConnect = ConnectManager.wasAppLaunchedFromConnect(presetAppId);
         connectLaunchPerformed = false;
+        biometricManager = BiometricManager.from(this);
+        biometricPromptCallbacks = preparePromptCallbacks();
 
         if (savedInstanceState == null) {
             // Only restore last user on the initial creation
@@ -197,17 +206,40 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
         }
     }
 
+
+
+    private BiometricPrompt.AuthenticationCallback preparePromptCallbacks() {
+        return new BiometricPrompt.AuthenticationCallback() {
+
+
+            @Override
+            public void onAuthenticationSucceeded(
+                    @NonNull BiometricPrompt.AuthenticationResult result) {
+                super.onAuthenticationSucceeded(result);
+                ConnectManager.goToConnectJobsList();
+                setResult(RESULT_OK);
+                finish();
+
+            }
+
+            @Override
+            public void onAuthenticationFailed() {
+                super.onAuthenticationFailed();
+                Toast.makeText(getApplicationContext(), "Authentication failed",
+                                Toast.LENGTH_SHORT)
+                        .show();
+            }
+        };
+    }
+
     /**
      * @param restoreSession Indicates if CommCare should attempt to restore the saved session
      *                       upon successful login
      */
     protected void initiateLoginAttempt(boolean restoreSession) {
         if(isConnectJobsSelected()) {
-            ConnectManager.unlockConnect(this, success -> {
-                if(success) {
-                    ConnectManager.goToConnectJobsList();
-                }
-            });
+            boolean allowOtherOptions = BiometricsHelper.isPinConfigured(this, biometricManager);
+            BiometricsHelper.authenticateFingerprint(this, biometricManager, allowOtherOptions, biometricPromptCallbacks);
         } else {
             LoginMode loginMode = uiController.getLoginMode();
 
@@ -469,13 +501,15 @@ private void setResultAndFinish(boolean goToJobInfo) {
 
     public void handleConnectButtonPress() {
         selectedAppIndex = -1;
-        ConnectManager.unlockConnect(this, success -> {
-            if(success) {
-                ConnectManager.goToConnectJobsList();
-                setResult(RESULT_OK);
-                finish();
-            }
-        });
+        boolean allowOtherOptions = BiometricsHelper.isPinConfigured(this, biometricManager);
+        BiometricsHelper.authenticateFingerprint(this, biometricManager, allowOtherOptions, biometricPromptCallbacks);
+//        ConnectManager.unlockConnect(this, success -> {
+//            if(success) {
+//                ConnectManager.goToConnectJobsList();
+//                setResult(RESULT_OK);
+//                finish();
+//            }
+//        });
     }
 
     public boolean handleConnectSignIn() {
diff --git a/app/src/org/commcare/activities/connect/ConnectIdBiometricConfigActivity.java b/app/src/org/commcare/activities/connect/ConnectIdBiometricConfigActivity.java
index d04ef0a201..244c906c96 100644
--- a/app/src/org/commcare/activities/connect/ConnectIdBiometricConfigActivity.java
+++ b/app/src/org/commcare/activities/connect/ConnectIdBiometricConfigActivity.java
@@ -1,15 +1,24 @@
 package org.commcare.activities.connect;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.biometric.BiometricManager;
+import androidx.biometric.BiometricPrompt;
 
 import org.commcare.activities.CommCareActivity;
 import org.commcare.connect.ConnectConstants;
 import org.commcare.dalvik.R;
+import org.commcare.google.services.analytics.AnalyticsParamValue;
+import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.interfaces.CommCareActivityUIController;
 import org.commcare.interfaces.WithUIController;
 import org.commcare.utils.BiometricsHelper;
 import org.commcare.views.dialogs.CustomProgressDialog;
+import org.javarosa.core.services.Logger;
 
 import androidx.biometric.BiometricManager;
 
@@ -24,22 +33,26 @@ public class ConnectIdBiometricConfigActivity extends CommCareActivity<ConnectId
     private ConnectIdBiometricConfigActivityUiController uiController;
     private BiometricManager biometricManager;
 
+    private BiometricPrompt.AuthenticationCallback biometricPromptCallbacks;
+
+    private boolean attemptingFingerprint = false;
+    private boolean allowPassword = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setTitle(getString(R.string.connect_verify_title));
         biometricManager = BiometricManager.from(this);
-
+        biometricPromptCallbacks = preparePromptCallbacks();
         uiController.setupUI();
-
         BiometricsHelper.ConfigurationStatus fingerprint = BiometricsHelper.checkFingerprintStatus(this,
                 biometricManager);
         BiometricsHelper.ConfigurationStatus pin = BiometricsHelper.checkPinStatus(this, biometricManager);
         if (fingerprint == BiometricsHelper.ConfigurationStatus.NotAvailable &&
                 pin == BiometricsHelper.ConfigurationStatus.NotAvailable) {
             //Skip to password-only workflow
-            finish(true, true);
+            finish(true, true,false);
         } else {
             updateState(fingerprint, pin);
         }
@@ -116,34 +129,83 @@ public void updateState(BiometricsHelper.ConfigurationStatus fingerprintStatus,
     }
 
     public void handleFingerprintButton() {
-        BiometricsHelper.ConfigurationStatus fingerprint = BiometricsHelper.checkFingerprintStatus(this,
-                biometricManager);
-        if (fingerprint == BiometricsHelper.ConfigurationStatus.Configured) {
-            finish(true, false);
-        } else if (!BiometricsHelper.configureFingerprint(this)) {
-            finish(true, true);
+
+        if (BiometricsHelper.isFingerprintConfigured(this, biometricManager)) {
+            //Automatically try fingerprint first
+            performFingerprintUnlock();
+        } else if (BiometricsHelper.isPinConfigured(this, biometricManager)) {
+            performPinUnlock();
+        }  else {
+            Logger.exception("No unlock method available when trying to unlock ConnectID", new Exception("No unlock option"));
         }
     }
 
+    public void performFingerprintUnlock() {
+        attemptingFingerprint = true;
+        boolean allowOtherOptions = BiometricsHelper.isPinConfigured(this, biometricManager) ||
+                allowPassword;
+        BiometricsHelper.authenticateFingerprint(this, biometricManager, allowOtherOptions, biometricPromptCallbacks);
+    }
+
+    public void performPinUnlock() {
+        BiometricsHelper.authenticatePin(this, biometricManager, biometricPromptCallbacks);
+    }
+
+    private BiometricPrompt.AuthenticationCallback preparePromptCallbacks() {
+        final Context context = this;
+        return new BiometricPrompt.AuthenticationCallback() {
+            @Override
+            public void onAuthenticationError(int errorCode,
+                                              @NonNull CharSequence errString) {
+                super.onAuthenticationError(errorCode, errString);
+                if (attemptingFingerprint) {
+                    attemptingFingerprint = false;
+                    if (BiometricsHelper.isPinConfigured(context, biometricManager) &&
+                            allowPassword) {
+                        //Automatically try password, it's the only option
+                        performPinUnlock();
+                    }
+                }
+            }
+
+            @Override
+            public void onAuthenticationSucceeded(
+                    @NonNull BiometricPrompt.AuthenticationResult result) {
+                super.onAuthenticationSucceeded(result);
+                logSuccess();
+                finish(true, false, false);
+            }
+
+            @Override
+            public void onAuthenticationFailed() {
+                super.onAuthenticationFailed();
+                Toast.makeText(getApplicationContext(), "Authentication failed",
+                                Toast.LENGTH_SHORT)
+                        .show();
+            }
+        };
+    }
+
+    private void logSuccess() {
+        String method = attemptingFingerprint ? AnalyticsParamValue.CCC_SIGN_IN_METHOD_FINGERPRINT
+                : AnalyticsParamValue.CCC_SIGN_IN_METHOD_PIN;
+        FirebaseAnalyticsUtil.reportCccSignIn(method);
+    }
+
     public void handlePinButton() {
         BiometricsHelper.ConfigurationStatus pin = BiometricsHelper.checkPinStatus(this, biometricManager);
         if (pin == BiometricsHelper.ConfigurationStatus.Configured) {
-            finish(true, false);
+            finish(true, false,false);
         } else if (!BiometricsHelper.configurePin(this)) {
-            finish(true, true);
+            finish(true, true,false);
         }
     }
 
-    public void finish(boolean success, boolean failedEnrollment) {
+    private void finish(boolean success, boolean password, boolean recover) {
         Intent intent = new Intent(getIntent());
 
-        BiometricsHelper.ConfigurationStatus fingerprint = BiometricsHelper.checkFingerprintStatus(this,
-                biometricManager);
-        BiometricsHelper.ConfigurationStatus pin = BiometricsHelper.checkPinStatus(this, biometricManager);
-        boolean configured = fingerprint == BiometricsHelper.ConfigurationStatus.Configured ||
-                pin == BiometricsHelper.ConfigurationStatus.Configured;
-
-        intent.putExtra(ConnectConstants.ENROLL_FAIL, failedEnrollment || !configured);
+        intent.putExtra(ConnectConstants.PASSWORD, password);
+        intent.putExtra(ConnectConstants.RECOVER, recover);
 
         setResult(success ? RESULT_OK : RESULT_CANCELED, intent);
         finish();
diff --git a/app/src/org/commcare/connect/ConnectIdWorkflows.java b/app/src/org/commcare/connect/ConnectIdWorkflows.java
index 3314a29e28..24b7a5ee1a 100644
--- a/app/src/org/commcare/connect/ConnectIdWorkflows.java
+++ b/app/src/org/commcare/connect/ConnectIdWorkflows.java
@@ -60,7 +60,7 @@ public static void beginRegistration(CommCareActivity<?> parent, ConnectManager.
                 }else if (user.shouldForcePassword()) {
                     requestCode = ConnectTask.CONNECT_UNLOCK_PASSWORD;
                 } else {
-                    requestCode = ConnectTask.CONNECT_UNLOCK_BIOMETRIC;
+//                    requestCode = ConnectTask.CONNECT_UNLOCK_BIOMETRIC;
                 }
             }
             default -> {
@@ -91,7 +91,7 @@ public static void unlockConnect(CommCareActivity<?> parent, ConnectManager.Conn
 
         ConnectUserRecord user = ConnectDatabaseHelper.getUser(parentActivity);
 
-        phase = ConnectTask.CONNECT_UNLOCK_BIOMETRIC;
+//        phase = ConnectTask.CONNECT_UNLOCK_BIOMETRIC;
         if (user.shouldForcePin()) {
             phase = ConnectTask.CONNECT_UNLOCK_PIN;
         } else if (user.shouldForcePassword()) {
@@ -218,8 +218,8 @@ private static void continueWorkflow() {
                 params.put(ConnectConstants.MESSAGE, R.string.connect_recovery_success_message);
                 params.put(ConnectConstants.BUTTON, R.string.connect_recovery_success_button);
             }
-            case CONNECT_UNLOCK_BIOMETRIC -> params.put(ConnectConstants.ALLOW_PASSWORD, "true");
-            case CONNECT_REGISTRATION_UNLOCK_BIOMETRIC, CONNECT_RECOVERY_UNLOCK_BIOMETRIC -> params.put(ConnectConstants.ALLOW_PASSWORD, "false");
+//            case CONNECT_UNLOCK_BIOMETRIC -> params.put(ConnectConstants.ALLOW_PASSWORD, "true");
+//            case CONNECT_REGISTRATION_UNLOCK_BIOMETRIC, CONNECT_RECOVERY_UNLOCK_BIOMETRIC -> params.put(ConnectConstants.ALLOW_PASSWORD, "false");
             case CONNECT_BIOMETRIC_ENROLL_FAIL -> {
                 params.put(ConnectConstants.TITLE, R.string.connect_biometric_enroll_fail_title);
                 params.put(ConnectConstants.MESSAGE, R.string.connect_biometric_enroll_fail_message);
@@ -297,8 +297,12 @@ public static boolean handleFinishedActivity(int requestCode, int resultCode, In
                 if (success) {
                     boolean failedEnrollment = intent.getBooleanExtra(ConnectConstants.ENROLL_FAIL, false);
                     nextRequestCode = failedEnrollment ? ConnectTask.CONNECT_BIOMETRIC_ENROLL_FAIL :
-                            ConnectTask.CONNECT_REGISTRATION_UNLOCK_BIOMETRIC;
+                            ConnectTask.CONNECT_REGISTRATION_VERIFY_PRIMARY_PHONE;
+                }else{
+                    nextRequestCode =
+                            ConnectTask.CONNECT_REGISTRATION_CONFIGURE_BIOMETRICS;
                 }
+                rememberPhase = success;
             }
             case CONNECT_BIOMETRIC_ENROLL_FAIL -> {
                 nextRequestCode = ConnectTask.CONNECT_REGISTRATION_CONFIGURE_BIOMETRICS;
@@ -307,11 +311,11 @@ public static boolean handleFinishedActivity(int requestCode, int resultCode, In
                     launchSecuritySettings = true;
                 }
             }
-            case CONNECT_REGISTRATION_UNLOCK_BIOMETRIC -> {
-                nextRequestCode = success ? ConnectTask.CONNECT_REGISTRATION_VERIFY_PRIMARY_PHONE :
-                        ConnectTask.CONNECT_REGISTRATION_CONFIGURE_BIOMETRICS;
-                rememberPhase = success;
-            }
+//            case CONNECT_REGISTRATION_UNLOCK_BIOMETRIC -> {
+//                nextRequestCode = success ? ConnectTask.CONNECT_REGISTRATION_VERIFY_PRIMARY_PHONE :
+//                        ConnectTask.CONNECT_REGISTRATION_CONFIGURE_BIOMETRICS;
+//                rememberPhase = success;
+//            }
             case CONNECT_REGISTRATION_VERIFY_PRIMARY_PHONE -> {
                 nextRequestCode = ConnectTask.CONNECT_REGISTRATION_CONFIGURE_BIOMETRICS;
                 if (success) {
@@ -388,15 +392,15 @@ public static boolean handleFinishedActivity(int requestCode, int resultCode, In
                 }
             }
             case CONNECT_RECOVERY_CONFIGURE_BIOMETRICS -> {
-                if (success) {
-                    nextRequestCode = ConnectTask.CONNECT_RECOVERY_UNLOCK_BIOMETRIC;
-                }
-            }
-            case CONNECT_RECOVERY_UNLOCK_BIOMETRIC -> {
                 if (success) {
                     nextRequestCode = ConnectTask.CONNECT_RECOVERY_VERIFY_PRIMARY_PHONE;
                 }
             }
+//            case CONNECT_RECOVERY_UNLOCK_BIOMETRIC -> {
+//                if (success) {
+//                    nextRequestCode = ConnectTask.CONNECT_RECOVERY_VERIFY_PRIMARY_PHONE;
+//                }
+//            }
             case CONNECT_RECOVERY_VERIFY_PRIMARY_PHONE -> {
                 if (success) {
                     if(intent.hasExtra(ConnectConstants.CONNECT_KEY_SECONDARY_PHONE)) {
@@ -484,15 +488,15 @@ public static boolean handleFinishedActivity(int requestCode, int resultCode, In
                 rememberPhase = true;
                 completeSignIn();
             }
-            case CONNECT_UNLOCK_BIOMETRIC -> {
-                if (success) {
-                    nextRequestCode = completeUnlock();
-                } else if (intent != null && intent.getBooleanExtra(ConnectConstants.PASSWORD, false)) {
-                    nextRequestCode = ConnectTask.CONNECT_UNLOCK_PASSWORD;
-                } else if (intent != null && intent.getBooleanExtra(ConnectConstants.RECOVER, false)) {
-                    nextRequestCode = ConnectTask.CONNECT_RECOVERY_PRIMARY_PHONE;
-                }
-            }
+//            case CONNECT_UNLOCK_BIOMETRIC -> {
+//                if (success) {
+//                    nextRequestCode = completeUnlock();
+//                } else if (intent != null && intent.getBooleanExtra(ConnectConstants.PASSWORD, false)) {
+//                    nextRequestCode = ConnectTask.CONNECT_UNLOCK_PASSWORD;
+//                } else if (intent != null && intent.getBooleanExtra(ConnectConstants.RECOVER, false)) {
+//                    nextRequestCode = ConnectTask.CONNECT_RECOVERY_PRIMARY_PHONE;
+//                }
+//            }
             case CONNECT_UNLOCK_PIN -> {
                 nextRequestCode = ConnectTask.CONNECT_RECOVERY_VERIFY_PRIMARY_PHONE;
                 if (success) {
diff --git a/app/src/org/commcare/connect/ConnectTask.java b/app/src/org/commcare/connect/ConnectTask.java
index 87b4bad680..fb4a694699 100644
--- a/app/src/org/commcare/connect/ConnectTask.java
+++ b/app/src/org/commcare/connect/ConnectTask.java
@@ -30,8 +30,7 @@ public enum ConnectTask {
             ConnectIdRegistrationActivity.class),
     CONNECT_REGISTRATION_CONFIGURE_BIOMETRICS(ConnectConstants.ConnectIdTaskIdOffset + 5,
             ConnectIdBiometricConfigActivity.class),
-    CONNECT_REGISTRATION_UNLOCK_BIOMETRIC(ConnectConstants.ConnectIdTaskIdOffset + 6,
-            ConnectIdBiometricUnlockActivity.class),
+
     CONNECT_REGISTRATION_VERIFY_PRIMARY_PHONE(ConnectConstants.ConnectIdTaskIdOffset + 7,
             ConnectIdPhoneVerificationActivity.class),
     CONNECT_REGISTRATION_CHANGE_PRIMARY_PHONE(ConnectConstants.ConnectIdTaskIdOffset + 8,
@@ -52,8 +51,8 @@ public enum ConnectTask {
             ConnectIdPhoneVerificationActivity.class),
     CONNECT_RECOVERY_SUCCESS(ConnectConstants.ConnectIdTaskIdOffset + 18,
             ConnectIdMessageActivity.class),
-    CONNECT_UNLOCK_BIOMETRIC(ConnectConstants.ConnectIdTaskIdOffset + 19,
-            ConnectIdBiometricUnlockActivity.class),
+//    CONNECT_UNLOCK_BIOMETRIC(ConnectConstants.ConnectIdTaskIdOffset + 19,
+//            ConnectIdBiometricUnlockActivity.class),
     CONNECT_UNLOCK_PASSWORD(ConnectConstants.ConnectIdTaskIdOffset + 20,
             ConnectIdPasswordVerificationActivity.class),
     CONNECT_UNLOCK_PIN(ConnectConstants.ConnectIdTaskIdOffset + 21,
@@ -72,8 +71,6 @@ public enum ConnectTask {
             ConnectIdPinActivity.class),
     CONNECT_RECOVERY_CONFIGURE_BIOMETRICS(ConnectConstants.ConnectIdTaskIdOffset + 28,
             ConnectIdBiometricConfigActivity.class),
-    CONNECT_RECOVERY_UNLOCK_BIOMETRIC(ConnectConstants.ConnectIdTaskIdOffset + 29,
-            ConnectIdBiometricUnlockActivity.class),
     CONNECT_VERIFY_ALT_PHONE_MESSAGE(ConnectConstants.ConnectIdTaskIdOffset + 30,
             ConnectIdMessageActivity.class),
     CONNECT_VERIFY_ALT_PHONE(ConnectConstants.ConnectIdTaskIdOffset + 31,