diff --git a/app/build.gradle b/app/build.gradle
index b59400f741..20a653613c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -158,6 +158,9 @@ android {
         exclude 'signal_jni.dll'
     }
 
+    buildFeatures {
+        viewBinding true
+    }
 
     defaultConfig {
         versionCode canonicalVersionCode * postFixSize
diff --git a/app/src/main/res/layout/about_preset_item.xml b/app/src/main/res/layout/about_preset_item.xml
index 9009929bca..2bbeda7893 100644
--- a/app/src/main/res/layout/about_preset_item.xml
+++ b/app/src/main/res/layout/about_preset_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/account_locked_fragment.xml b/app/src/main/res/layout/account_locked_fragment.xml
index e04f977ede..05a2fb84ed 100644
--- a/app/src/main/res/layout/account_locked_fragment.xml
+++ b/app/src/main/res/layout/account_locked_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/action_mode_close_layout.xml b/app/src/main/res/layout/action_mode_close_layout.xml
index ec45141db1..9660f4e2d6 100644
--- a/app/src/main/res/layout/action_mode_close_layout.xml
+++ b/app/src/main/res/layout/action_mode_close_layout.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/action_mode_close_button"
     android:layout_width="24dp"
diff --git a/app/src/main/res/layout/activity_change_number_lock.xml b/app/src/main/res/layout/activity_change_number_lock.xml
index 21b02118af..2f141327f1 100644
--- a/app/src/main/res/layout/activity_change_number_lock.xml
+++ b/app/src/main/res/layout/activity_change_number_lock.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/change_number_lock_scroll"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contact_name_edit.xml b/app/src/main/res/layout/activity_contact_name_edit.xml
index c8a62e56cf..2d1014c77b 100644
--- a/app/src/main/res/layout/activity_contact_name_edit.xml
+++ b/app/src/main/res/layout/activity_contact_name_edit.xml
@@ -2,6 +2,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/activity_contact_share_edit.xml b/app/src/main/res/layout/activity_contact_share_edit.xml
index 1f2f5f9b1d..322dbcd3f0 100644
--- a/app/src/main/res/layout/activity_contact_share_edit.xml
+++ b/app/src/main/res/layout/activity_contact_share_edit.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/activity_map_bottom_sheet_view.xml b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml
index 6746360268..c9e1a7585d 100755
--- a/app/src/main/res/layout/activity_map_bottom_sheet_view.xml
+++ b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_place_picker.xml b/app/src/main/res/layout/activity_place_picker.xml
index f9665bfe41..0f91f56e9a 100644
--- a/app/src/main/res/layout/activity_place_picker.xml
+++ b/app/src/main/res/layout/activity_place_picker.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_registration_navigation.xml b/app/src/main/res/layout/activity_registration_navigation.xml
index ae778f46c6..6c015abb3c 100644
--- a/app/src/main/res/layout/activity_registration_navigation.xml
+++ b/app/src/main/res/layout/activity_registration_navigation.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml
index 1b2c4375e6..67f919662e 100644
--- a/app/src/main/res/layout/activity_shared_contact_details.xml
+++ b/app/src/main/res/layout/activity_shared_contact_details.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
diff --git a/app/src/main/res/layout/add_group_details_activity.xml b/app/src/main/res/layout/add_group_details_activity.xml
index c2fe2cfdde..0e6fce29d2 100644
--- a/app/src/main/res/layout/add_group_details_activity.xml
+++ b/app/src/main/res/layout/add_group_details_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/nav_host_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_group_details_fragment.xml b/app/src/main/res/layout/add_group_details_fragment.xml
index fdc1d78ca0..bde49ad434 100644
--- a/app/src/main/res/layout/add_group_details_fragment.xml
+++ b/app/src/main/res/layout/add_group_details_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/add_members_activity.xml b/app/src/main/res/layout/add_members_activity.xml
index 7d8cf9aa87..e1c893ed43 100644
--- a/app/src/main/res/layout/add_members_activity.xml
+++ b/app/src/main/res/layout/add_members_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/add_to_group_activity.xml b/app/src/main/res/layout/add_to_group_activity.xml
index 6783025ff6..0e4a4d2d42 100644
--- a/app/src/main/res/layout/add_to_group_activity.xml
+++ b/app/src/main/res/layout/add_to_group_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/album_thumbnail_2.xml b/app/src/main/res/layout/album_thumbnail_2.xml
index 3fad6e678e..05248dbbd7 100644
--- a/app/src/main/res/layout/album_thumbnail_2.xml
+++ b/app/src/main/res/layout/album_thumbnail_2.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/album_thumbnail_root"
diff --git a/app/src/main/res/layout/album_thumbnail_3.xml b/app/src/main/res/layout/album_thumbnail_3.xml
index 9a3bde7542..196486c8e5 100644
--- a/app/src/main/res/layout/album_thumbnail_3.xml
+++ b/app/src/main/res/layout/album_thumbnail_3.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/album_thumbnail_root"
diff --git a/app/src/main/res/layout/album_thumbnail_4.xml b/app/src/main/res/layout/album_thumbnail_4.xml
index 9b28e18316..24d6c12ff2 100644
--- a/app/src/main/res/layout/album_thumbnail_4.xml
+++ b/app/src/main/res/layout/album_thumbnail_4.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/album_thumbnail_root"
diff --git a/app/src/main/res/layout/album_thumbnail_5.xml b/app/src/main/res/layout/album_thumbnail_5.xml
index 70ef5524dc..36cdd93504 100644
--- a/app/src/main/res/layout/album_thumbnail_5.xml
+++ b/app/src/main/res/layout/album_thumbnail_5.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/album_thumbnail_root"
diff --git a/app/src/main/res/layout/album_thumbnail_many.xml b/app/src/main/res/layout/album_thumbnail_many.xml
index b8533d4532..46d22e497b 100644
--- a/app/src/main/res/layout/album_thumbnail_many.xml
+++ b/app/src/main/res/layout/album_thumbnail_many.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/album_thumbnail_root"
diff --git a/app/src/main/res/layout/album_thumbnail_view.xml b/app/src/main/res/layout/album_thumbnail_view.xml
index 70155fcb48..147bb5850d 100644
--- a/app/src/main/res/layout/album_thumbnail_view.xml
+++ b/app/src/main/res/layout/album_thumbnail_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/alert_view.xml b/app/src/main/res/layout/alert_view.xml
index a5f1092021..648f2141d2 100644
--- a/app/src/main/res/layout/alert_view.xml
+++ b/app/src/main/res/layout/alert_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools">
+    tools:viewBindingIgnore="true"
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/sms_failed_indicator"
diff --git a/app/src/main/res/layout/application_migration_activity.xml b/app/src/main/res/layout/application_migration_activity.xml
index b3ebf5f2bc..bda618b889 100644
--- a/app/src/main/res/layout/application_migration_activity.xml
+++ b/app/src/main/res/layout/application_migration_activity.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/attachment_keyboad_media_item.xml b/app/src/main/res/layout/attachment_keyboad_media_item.xml
index 9cb5e22e9f..0334f21fb7 100644
--- a/app/src/main/res/layout/attachment_keyboad_media_item.xml
+++ b/app/src/main/res/layout/attachment_keyboad_media_item.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <org.thoughtcrime.securesms.components.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/attachment_keyboard.xml b/app/src/main/res/layout/attachment_keyboard.xml
index 33363481ab..ed029dd1ba 100644
--- a/app/src/main/res/layout/attachment_keyboard.xml
+++ b/app/src/main/res/layout/attachment_keyboard.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/attachment_keyboard_button_item.xml b/app/src/main/res/layout/attachment_keyboard_button_item.xml
index 398923f20b..7faf23245b 100644
--- a/app/src/main/res/layout/attachment_keyboard_button_item.xml
+++ b/app/src/main/res/layout/attachment_keyboard_button_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ButtonStripItemView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/audio_indicator_view.xml b/app/src/main/res/layout/audio_indicator_view.xml
index b747191e73..b2fe24d236 100644
--- a/app/src/main/res/layout/audio_indicator_view.xml
+++ b/app/src/main/res/layout/audio_indicator_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatImageView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mic_muted"
diff --git a/app/src/main/res/layout/audio_output_adapter_radio_item.xml b/app/src/main/res/layout/audio_output_adapter_radio_item.xml
index 54e3b5ede3..a50a8d9f10 100644
--- a/app/src/main/res/layout/audio_output_adapter_radio_item.xml
+++ b/app/src/main/res/layout/audio_output_adapter_radio_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/selectableItemBackground"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/audio_view.xml b/app/src/main/res/layout/audio_view.xml
index f2c07c3720..9faa96d45a 100644
--- a/app/src/main/res/layout/audio_view.xml
+++ b/app/src/main/res/layout/audio_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     tools:context="org.thoughtcrime.securesms.components.AudioView">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/audio_view_circle.xml b/app/src/main/res/layout/audio_view_circle.xml
index d575960c00..2e0bb32ecd 100644
--- a/app/src/main/res/layout/audio_view_circle.xml
+++ b/app/src/main/res/layout/audio_view_circle.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.AnimatingToggle xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/control_toggle"
     android:layout_width="48dp"
diff --git a/app/src/main/res/layout/audio_view_circle_small.xml b/app/src/main/res/layout/audio_view_circle_small.xml
index 748097eec3..f7ec83b203 100644
--- a/app/src/main/res/layout/audio_view_circle_small.xml
+++ b/app/src/main/res/layout/audio_view_circle_small.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.AnimatingToggle xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/control_toggle"
     android:layout_width="48dp"
diff --git a/app/src/main/res/layout/audio_view_draft.xml b/app/src/main/res/layout/audio_view_draft.xml
index 8050d5fe4a..4de516249a 100644
--- a/app/src/main/res/layout/audio_view_draft.xml
+++ b/app/src/main/res/layout/audio_view_draft.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     tools:context="org.thoughtcrime.securesms.components.AudioView">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/audio_view_draft_circle.xml b/app/src/main/res/layout/audio_view_draft_circle.xml
index ecba2d9efd..78fd9bccaa 100644
--- a/app/src/main/res/layout/audio_view_draft_circle.xml
+++ b/app/src/main/res/layout/audio_view_draft_circle.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.AnimatingToggle xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/control_toggle"
     android:layout_width="@dimen/conversation_compose_height"
diff --git a/app/src/main/res/layout/audio_view_small.xml b/app/src/main/res/layout/audio_view_small.xml
index 00916e3400..d9b77592c4 100644
--- a/app/src/main/res/layout/audio_view_small.xml
+++ b/app/src/main/res/layout/audio_view_small.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     tools:context="org.thoughtcrime.securesms.components.AudioView">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/avatar_color_item.xml b/app/src/main/res/layout/avatar_color_item.xml
index 50498ae2f4..25aa1eb579 100644
--- a/app/src/main/res/layout/avatar_color_item.xml
+++ b/app/src/main/res/layout/avatar_color_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/avatar_photo_editor_fragment.xml b/app/src/main/res/layout/avatar_photo_editor_fragment.xml
index 90c9e68422..162e65229f 100644
--- a/app/src/main/res/layout/avatar_photo_editor_fragment.xml
+++ b/app/src/main/res/layout/avatar_photo_editor_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/avatar_picker_fragment.xml b/app/src/main/res/layout/avatar_picker_fragment.xml
index 9dfc6b3288..5835deac5c 100644
--- a/app/src/main/res/layout/avatar_picker_fragment.xml
+++ b/app/src/main/res/layout/avatar_picker_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/avatar_picker_item.xml b/app/src/main/res/layout/avatar_picker_item.xml
index 1772610881..d65160801a 100644
--- a/app/src/main/res/layout/avatar_picker_item.xml
+++ b/app/src/main/res/layout/avatar_picker_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/avatar_selection_activity.xml b/app/src/main/res/layout/avatar_selection_activity.xml
index 1d249e3e93..c53ed0067a 100644
--- a/app/src/main/res/layout/avatar_selection_activity.xml
+++ b/app/src/main/res/layout/avatar_selection_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment.xml
index abf1a1e261..db898f7e2f 100644
--- a/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment_option.xml b/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment_option.xml
index f38339b255..3cfd08be27 100644
--- a/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment_option.xml
+++ b/app/src/main/res/layout/avatar_selection_bottom_sheet_dialog_fragment_option.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/avatar_selection_bottom_sheet_dialog_fragment_recycler"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/avatar_view.xml b/app/src/main/res/layout/avatar_view.xml
index f59a2857ec..fcb766e2c1 100644
--- a/app/src/main/res/layout/avatar_view.xml
+++ b/app/src/main/res/layout/avatar_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:layout_height="56dp"
diff --git a/app/src/main/res/layout/backup_choose_location_dialog.xml b/app/src/main/res/layout/backup_choose_location_dialog.xml
index 303da7951d..e886d69fcb 100644
--- a/app/src/main/res/layout/backup_choose_location_dialog.xml
+++ b/app/src/main/res/layout/backup_choose_location_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/backup_enable_dialog.xml b/app/src/main/res/layout/backup_enable_dialog.xml
index f8108c81d8..aa3d7c087c 100644
--- a/app/src/main/res/layout/backup_enable_dialog.xml
+++ b/app/src/main/res/layout/backup_enable_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/backup_enable_dialog_v29.xml b/app/src/main/res/layout/backup_enable_dialog_v29.xml
index e176b33119..5c4bb16c05 100644
--- a/app/src/main/res/layout/backup_enable_dialog_v29.xml
+++ b/app/src/main/res/layout/backup_enable_dialog_v29.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/bad_decrypt_learn_more_dialog_fragment.xml b/app/src/main/res/layout/bad_decrypt_learn_more_dialog_fragment.xml
index c0a2dc66e3..c3db70bb18 100644
--- a/app/src/main/res/layout/bad_decrypt_learn_more_dialog_fragment.xml
+++ b/app/src/main/res/layout/bad_decrypt_learn_more_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/badge_display_112.xml b/app/src/main/res/layout/badge_display_112.xml
index 06045c44bf..425ec51097 100644
--- a/app/src/main/res/layout/badge_display_112.xml
+++ b/app/src/main/res/layout/badge_display_112.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/badge_display_160.xml b/app/src/main/res/layout/badge_display_160.xml
index 94be25d732..184d7f7392 100644
--- a/app/src/main/res/layout/badge_display_160.xml
+++ b/app/src/main/res/layout/badge_display_160.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/badge_preference_view.xml b/app/src/main/res/layout/badge_preference_view.xml
index e988abd673..7396e2f43b 100644
--- a/app/src/main/res/layout/badge_preference_view.xml
+++ b/app/src/main/res/layout/badge_preference_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml
index bfa33847e8..3e6be0c77f 100644
--- a/app/src/main/res/layout/base_kbs_pin_fragment.xml
+++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/base_settings_fragment.xml b/app/src/main/res/layout/base_settings_fragment.xml
index adaa315d9a..b48aa27ced 100644
--- a/app/src/main/res/layout/base_settings_fragment.xml
+++ b/app/src/main/res/layout/base_settings_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/base_settings_list"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/base_settings_header_item.xml b/app/src/main/res/layout/base_settings_header_item.xml
index 34c4472b3c..6a7103fa74 100644
--- a/app/src/main/res/layout/base_settings_header_item.xml
+++ b/app/src/main/res/layout/base_settings_header_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/base_settings_header_item_text"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/base_settings_progress_item.xml b/app/src/main/res/layout/base_settings_progress_item.xml
index 3a8b133437..4424f40575 100644
--- a/app/src/main/res/layout/base_settings_progress_item.xml
+++ b/app/src/main/res/layout/base_settings_progress_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/base_settings_header_item_text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/basic_megaphone_view.xml b/app/src/main/res/layout/basic_megaphone_view.xml
index 61cc75a1ea..d7aced8e9e 100644
--- a/app/src/main/res/layout/basic_megaphone_view.xml
+++ b/app/src/main/res/layout/basic_megaphone_view.xml
@@ -2,6 +2,7 @@
 
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/app/src/main/res/layout/bio_preference_item.xml b/app/src/main/res/layout/bio_preference_item.xml
index 8597f3b539..1c62471c15 100644
--- a/app/src/main/res/layout/bio_preference_item.xml
+++ b/app/src/main/res/layout/bio_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/blocked_users_activity.xml b/app/src/main/res/layout/blocked_users_activity.xml
index 096d1ee77d..a16f7b80b2 100644
--- a/app/src/main/res/layout/blocked_users_activity.xml
+++ b/app/src/main/res/layout/blocked_users_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/blocked_users_adapter_item.xml b/app/src/main/res/layout/blocked_users_adapter_item.xml
index cd245cdbec..043d9a83d8 100644
--- a/app/src/main/res/layout/blocked_users_adapter_item.xml
+++ b/app/src/main/res/layout/blocked_users_adapter_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeight"
diff --git a/app/src/main/res/layout/blocked_users_fragment.xml b/app/src/main/res/layout/blocked_users_fragment.xml
index f88de50f15..29a6415c55 100644
--- a/app/src/main/res/layout/blocked_users_fragment.xml
+++ b/app/src/main/res/layout/blocked_users_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/bold_selection_tab_item.xml b/app/src/main/res/layout/bold_selection_tab_item.xml
index 79ae9fe5f7..c6291096b0 100644
--- a/app/src/main/res/layout/bold_selection_tab_item.xml
+++ b/app/src/main/res/layout/bold_selection_tab_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.BoldSelectionTabItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/boost_animation_pref.xml b/app/src/main/res/layout/boost_animation_pref.xml
index d01c1e2ff4..e825c381b8 100644
--- a/app/src/main/res/layout/boost_animation_pref.xml
+++ b/app/src/main/res/layout/boost_animation_pref.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/boost_bottom_sheet.xml b/app/src/main/res/layout/boost_bottom_sheet.xml
index e28e5ae4de..5c80e5d907 100644
--- a/app/src/main/res/layout/boost_bottom_sheet.xml
+++ b/app/src/main/res/layout/boost_bottom_sheet.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/boost_loading_preference.xml b/app/src/main/res/layout/boost_loading_preference.xml
index dac3bfb1c2..a423b74a3b 100644
--- a/app/src/main/res/layout/boost_loading_preference.xml
+++ b/app/src/main/res/layout/boost_loading_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/boost_preference.xml b/app/src/main/res/layout/boost_preference.xml
index 69963d6bd1..f4410aa340 100644
--- a/app/src/main/res/layout/boost_preference.xml
+++ b/app/src/main/res/layout/boost_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/boost_preview_preference.xml b/app/src/main/res/layout/boost_preview_preference.xml
index c07243eb0d..57455708a6 100644
--- a/app/src/main/res/layout/boost_preview_preference.xml
+++ b/app/src/main/res/layout/boost_preview_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.badges.BadgeImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="96dp"
     android:layout_height="96dp"
     android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/bottom_sheet_container.xml b/app/src/main/res/layout/bottom_sheet_container.xml
index cb269caa2d..9229586e6c 100644
--- a/app/src/main/res/layout/bottom_sheet_container.xml
+++ b/app/src/main/res/layout/bottom_sheet_container.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/button_strip_item_view.xml b/app/src/main/res/layout/button_strip_item_view.xml
index 87b16b5e00..5654e28436 100644
--- a/app/src/main/res/layout/button_strip_item_view.xml
+++ b/app/src/main/res/layout/button_strip_item_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/call_participant_item.xml b/app/src/main/res/layout/call_participant_item.xml
index 48dfa8cc31..d752b70879 100644
--- a/app/src/main/res/layout/call_participant_item.xml
+++ b/app/src/main/res/layout/call_participant_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.webrtc.CallParticipantView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/call_participant_list_update.xml b/app/src/main/res/layout/call_participant_list_update.xml
index efb8867ce1..331305da6e 100644
--- a/app/src/main/res/layout/call_participant_list_update.xml
+++ b/app/src/main/res/layout/call_participant_list_update.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="94dp">
diff --git a/app/src/main/res/layout/call_participants_list_dialog.xml b/app/src/main/res/layout/call_participants_list_dialog.xml
index ac7784ae55..9dac0a7c60 100644
--- a/app/src/main/res/layout/call_participants_list_dialog.xml
+++ b/app/src/main/res/layout/call_participants_list_dialog.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_participants_list_header.xml b/app/src/main/res/layout/call_participants_list_header.xml
index d9a724743e..fb993d49f4 100644
--- a/app/src/main/res/layout/call_participants_list_header.xml
+++ b/app/src/main/res/layout/call_participants_list_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/call_participants_list_header"
     style="@style/TextAppearance.Signal.Body2.Bold"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/call_participants_list_item.xml b/app/src/main/res/layout/call_participants_list_item.xml
index abfea6a254..5f5a4fb335 100644
--- a/app/src/main/res/layout/call_participants_list_item.xml
+++ b/app/src/main/res/layout/call_participants_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/call_toast_popup_window.xml b/app/src/main/res/layout/call_toast_popup_window.xml
index e40fd4e993..78737fe25a 100644
--- a/app/src/main/res/layout/call_toast_popup_window.xml
+++ b/app/src/main/res/layout/call_toast_popup_window.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="94dp">
diff --git a/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml b/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml
index 9a76c7f690..c5a5b8e8a4 100644
--- a/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml
+++ b/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/camera_contact_contact_item.xml b/app/src/main/res/layout/camera_contact_contact_item.xml
index a6447528c1..e0d912b3e1 100644
--- a/app/src/main/res/layout/camera_contact_contact_item.xml
+++ b/app/src/main/res/layout/camera_contact_contact_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal" 
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/camera_contact_header_item.xml b/app/src/main/res/layout/camera_contact_header_item.xml
index 36ff7c526a..ac267691be 100644
--- a/app/src/main/res/layout/camera_contact_header_item.xml
+++ b/app/src/main/res/layout/camera_contact_header_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/camera_contact_header"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/camera_contact_invite_item.xml b/app/src/main/res/layout/camera_contact_invite_item.xml
index 197c7e7711..e02459f0c0 100644
--- a/app/src/main/res/layout/camera_contact_invite_item.xml
+++ b/app/src/main/res/layout/camera_contact_invite_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/camera_contact_selection_fragment.xml b/app/src/main/res/layout/camera_contact_selection_fragment.xml
index ecd6d36093..9ca3ee9418 100644
--- a/app/src/main/res/layout/camera_contact_selection_fragment.xml
+++ b/app/src/main/res/layout/camera_contact_selection_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/camera_contact_selection_item.xml b/app/src/main/res/layout/camera_contact_selection_item.xml
index edb428e4d8..13f1f48075 100644
--- a/app/src/main/res/layout/camera_contact_selection_item.xml
+++ b/app/src/main/res/layout/camera_contact_selection_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.FromTextView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/camera_controls_landscape.xml b/app/src/main/res/layout/camera_controls_landscape.xml
index 42891d9f99..b0bba5b1ff 100644
--- a/app/src/main/res/layout/camera_controls_landscape.xml
+++ b/app/src/main/res/layout/camera_controls_landscape.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/camera_controls_portrait.xml b/app/src/main/res/layout/camera_controls_portrait.xml
index 22a3f93bae..02696c0bda 100644
--- a/app/src/main/res/layout/camera_controls_portrait.xml
+++ b/app/src/main/res/layout/camera_controls_portrait.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/camera_fragment.xml b/app/src/main/res/layout/camera_fragment.xml
index 2d2e55eecb..d05b9afb5b 100644
--- a/app/src/main/res/layout/camera_fragment.xml
+++ b/app/src/main/res/layout/camera_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/camerax_fragment.xml b/app/src/main/res/layout/camerax_fragment.xml
index ab88cea34f..f984fc9d8b 100644
--- a/app/src/main/res/layout/camerax_fragment.xml
+++ b/app/src/main/res/layout/camerax_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/change_passphrase_activity.xml b/app/src/main/res/layout/change_passphrase_activity.xml
index 4dfe1626f0..e8f6349dea 100644
--- a/app/src/main/res/layout/change_passphrase_activity.xml
+++ b/app/src/main/res/layout/change_passphrase_activity.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:fillViewport="true">
diff --git a/app/src/main/res/layout/chat_color_custom_adapter_item.xml b/app/src/main/res/layout/chat_color_custom_adapter_item.xml
index 455bbeff97..ff7c1073f8 100644
--- a/app/src/main/res/layout/chat_color_custom_adapter_item.xml
+++ b/app/src/main/res/layout/chat_color_custom_adapter_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="68dp"
diff --git a/app/src/main/res/layout/chat_color_selection_adapter_item.xml b/app/src/main/res/layout/chat_color_selection_adapter_item.xml
index 7221b04563..002ee9c088 100644
--- a/app/src/main/res/layout/chat_color_selection_adapter_item.xml
+++ b/app/src/main/res/layout/chat_color_selection_adapter_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="68dp"
diff --git a/app/src/main/res/layout/chat_color_selection_fragment.xml b/app/src/main/res/layout/chat_color_selection_fragment.xml
index 6b2a0ced60..90ec1a0922 100644
--- a/app/src/main/res/layout/chat_color_selection_fragment.xml
+++ b/app/src/main/res/layout/chat_color_selection_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/chat_colors_fragment_context_menu.xml b/app/src/main/res/layout/chat_colors_fragment_context_menu.xml
index 66eb668f30..4117a0fc29 100644
--- a/app/src/main/res/layout/chat_colors_fragment_context_menu.xml
+++ b/app/src/main/res/layout/chat_colors_fragment_context_menu.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_colors_preview_view.xml b/app/src/main/res/layout/chat_colors_preview_view.xml
index 3c7ad3c1d1..e5fe51b5f9 100644
--- a/app/src/main/res/layout/chat_colors_preview_view.xml
+++ b/app/src/main/res/layout/chat_colors_preview_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_wallpaper_activity.xml b/app/src/main/res/layout/chat_wallpaper_activity.xml
index da72af9722..e2711eacab 100644
--- a/app/src/main/res/layout/chat_wallpaper_activity.xml
+++ b/app/src/main/res/layout/chat_wallpaper_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/nav_host_fragment"
     android:name="androidx.navigation.fragment.NavHostFragment"
diff --git a/app/src/main/res/layout/chat_wallpaper_crop_activity.xml b/app/src/main/res/layout/chat_wallpaper_crop_activity.xml
index bf8ae5e3a1..af8e32a0c1 100644
--- a/app/src/main/res/layout/chat_wallpaper_crop_activity.xml
+++ b/app/src/main/res/layout/chat_wallpaper_crop_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InsetAwareConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/chat_wallpaper_fragment.xml b/app/src/main/res/layout/chat_wallpaper_fragment.xml
index 91aa3b6ef3..87417be75f 100644
--- a/app/src/main/res/layout/chat_wallpaper_fragment.xml
+++ b/app/src/main/res/layout/chat_wallpaper_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_wallpaper_preview_activity.xml b/app/src/main/res/layout/chat_wallpaper_preview_activity.xml
index 77b3dc6585..6d2ed7336f 100644
--- a/app/src/main/res/layout/chat_wallpaper_preview_activity.xml
+++ b/app/src/main/res/layout/chat_wallpaper_preview_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InsetAwareConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/chat_wallpaper_preview_fragment_adapter_item.xml b/app/src/main/res/layout/chat_wallpaper_preview_fragment_adapter_item.xml
index 373147f7ae..e3937e485e 100644
--- a/app/src/main/res/layout/chat_wallpaper_preview_fragment_adapter_item.xml
+++ b/app/src/main/res/layout/chat_wallpaper_preview_fragment_adapter_item.xml
@@ -2,6 +2,7 @@
 
 <com.google.android.exoplayer2.ui.AspectRatioFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/chat_wallpaper_selection_fragment.xml b/app/src/main/res/layout/chat_wallpaper_selection_fragment.xml
index 922ffec3cc..7966c5c0be 100644
--- a/app/src/main/res/layout/chat_wallpaper_selection_fragment.xml
+++ b/app/src/main/res/layout/chat_wallpaper_selection_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/chat_wallpaper_selection_fragment_adapter_item.xml b/app/src/main/res/layout/chat_wallpaper_selection_fragment_adapter_item.xml
index 79928af081..fbdd2bacdb 100644
--- a/app/src/main/res/layout/chat_wallpaper_selection_fragment_adapter_item.xml
+++ b/app/src/main/res/layout/chat_wallpaper_selection_fragment_adapter_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.exoplayer2.ui.AspectRatioFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/chat_wallpaper_preview_frame"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml b/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml
index 8f7cdf7eeb..9c51c6097f 100644
--- a/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml
+++ b/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/choose_new_admin_activity.xml b/app/src/main/res/layout/choose_new_admin_activity.xml
index 0b67013e35..71b07ee227 100644
--- a/app/src/main/res/layout/choose_new_admin_activity.xml
+++ b/app/src/main/res/layout/choose_new_admin_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/circular_progress_material_button.xml b/app/src/main/res/layout/circular_progress_material_button.xml
index b3c5eb5e51..2886e7a34b 100644
--- a/app/src/main/res/layout/circular_progress_material_button.xml
+++ b/app/src/main/res/layout/circular_progress_material_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:parentTag="org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton">
 
diff --git a/app/src/main/res/layout/client_deprecated_activity.xml b/app/src/main/res/layout/client_deprecated_activity.xml
index cfb573afaa..0411a8d85d 100644
--- a/app/src/main/res/layout/client_deprecated_activity.xml
+++ b/app/src/main/res/layout/client_deprecated_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/confirm_payment_divider.xml b/app/src/main/res/layout/confirm_payment_divider.xml
index 33509e59aa..83e6cf0cca 100644
--- a/app/src/main/res/layout/confirm_payment_divider.xml
+++ b/app/src/main/res/layout/confirm_payment_divider.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="1dp"
     android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/confirm_payment_fragment.xml b/app/src/main/res/layout/confirm_payment_fragment.xml
index a7e6faadbe..18ea557bbc 100644
--- a/app/src/main/res/layout/confirm_payment_fragment.xml
+++ b/app/src/main/res/layout/confirm_payment_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/confirm_payment_line_item.xml b/app/src/main/res/layout/confirm_payment_line_item.xml
index 57de202714..abf49706b6 100644
--- a/app/src/main/res/layout/confirm_payment_line_item.xml
+++ b/app/src/main/res/layout/confirm_payment_line_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/confirm_payment_loading_item.xml b/app/src/main/res/layout/confirm_payment_loading_item.xml
index d093120a21..41ce70cc05 100644
--- a/app/src/main/res/layout/confirm_payment_loading_item.xml
+++ b/app/src/main/res/layout/confirm_payment_loading_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="200dp">
diff --git a/app/src/main/res/layout/confirm_payment_status.xml b/app/src/main/res/layout/confirm_payment_status.xml
index 544781e20f..db7e0bd71a 100644
--- a/app/src/main/res/layout/confirm_payment_status.xml
+++ b/app/src/main/res/layout/confirm_payment_status.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/confirm_payment_total_line_item.xml b/app/src/main/res/layout/confirm_payment_total_line_item.xml
index 6203b7b35e..5e66840ddf 100644
--- a/app/src/main/res/layout/confirm_payment_total_line_item.xml
+++ b/app/src/main/res/layout/confirm_payment_total_line_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/contact_filter_view.xml b/app/src/main/res/layout/contact_filter_view.xml
index 7583f9baaf..86c6ef3751 100644
--- a/app/src/main/res/layout/contact_filter_view.xml
+++ b/app/src/main/res/layout/contact_filter_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/contact_photo_preview_activity.xml b/app/src/main/res/layout/contact_photo_preview_activity.xml
index 263edc7f8a..93e0732cd8 100644
--- a/app/src/main/res/layout/contact_photo_preview_activity.xml
+++ b/app/src/main/res/layout/contact_photo_preview_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/contact_search_item.xml b/app/src/main/res/layout/contact_search_item.xml
index 92ac4da9b3..a040637e9d 100644
--- a/app/src/main/res/layout/contact_search_item.xml
+++ b/app/src/main/res/layout/contact_search_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_search_section_header.xml b/app/src/main/res/layout/contact_search_section_header.xml
index cb8e63f69d..f6e97eadc5 100644
--- a/app/src/main/res/layout/contact_search_section_header.xml
+++ b/app/src/main/res/layout/contact_search_section_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_selection_activity.xml b/app/src/main/res/layout/contact_selection_activity.xml
index a3e87565b0..7677b0545e 100644
--- a/app/src/main/res/layout/contact_selection_activity.xml
+++ b/app/src/main/res/layout/contact_selection_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/contact_selection_invite_action_item.xml b/app/src/main/res/layout/contact_selection_invite_action_item.xml
index bf3c1ae11a..eb3fc62c00 100644
--- a/app/src/main/res/layout/contact_selection_invite_action_item.xml
+++ b/app/src/main/res/layout/contact_selection_invite_action_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_selection_list_chip.xml b/app/src/main/res/layout/contact_selection_list_chip.xml
index fe3ee0236b..2b1704bb1d 100644
--- a/app/src/main/res/layout/contact_selection_list_chip.xml
+++ b/app/src/main/res/layout/contact_selection_list_chip.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.contacts.ContactChip xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/contact_chip"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_selection_list_divider.xml b/app/src/main/res/layout/contact_selection_list_divider.xml
index bb4606df1f..bdb6cc9b93 100644
--- a/app/src/main/res/layout/contact_selection_list_divider.xml
+++ b/app/src/main/res/layout/contact_selection_list_divider.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.EmojiTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/label"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_selection_list_fragment.xml b/app/src/main/res/layout/contact_selection_list_fragment.xml
index e2c827194a..34ad0a4a56 100644
--- a/app/src/main/res/layout/contact_selection_list_fragment.xml
+++ b/app/src/main/res/layout/contact_selection_list_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/contact_selection_list_item.xml b/app/src/main/res/layout/contact_selection_list_item.xml
index 2ed48cedaa..f6fb8cf0e8 100644
--- a/app/src/main/res/layout/contact_selection_list_item.xml
+++ b/app/src/main/res/layout/contact_selection_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.contacts.ContactSelectionListItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_selection_new_group_item.xml b/app/src/main/res/layout/contact_selection_new_group_item.xml
index 24b46513b9..91943ff688 100644
--- a/app/src/main/res/layout/contact_selection_new_group_item.xml
+++ b/app/src/main/res/layout/contact_selection_new_group_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_selection_recyclerview_header.xml b/app/src/main/res/layout/contact_selection_recyclerview_header.xml
index 54448eeaf7..22707a2384 100644
--- a/app/src/main/res/layout/contact_selection_recyclerview_header.xml
+++ b/app/src/main/res/layout/contact_selection_recyclerview_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
           android:layout_width="@dimen/selection_item_header_width"
           android:layout_height="@dimen/selection_item_header_height"
           android:gravity="center"
diff --git a/app/src/main/res/layout/contacts_expand_item.xml b/app/src/main/res/layout/contacts_expand_item.xml
index f6904b3186..f751c316f8 100644
--- a/app/src/main/res/layout/contacts_expand_item.xml
+++ b/app/src/main/res/layout/contacts_expand_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="56dp"
diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index 239bc749be..020c9af498 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InsetAwareConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
index 67a956f61b..8ef04f0256 100644
--- a/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
+++ b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
              xmlns:app="http://schemas.android.com/apk/res-auto"
              android:id="@+id/attachment_editor"
              android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_activity_attachment_keyboard_stub.xml b/app/src/main/res/layout/conversation_activity_attachment_keyboard_stub.xml
index e963ff3bf9..3e9fa44865 100644
--- a/app/src/main/res/layout/conversation_activity_attachment_keyboard_stub.xml
+++ b/app/src/main/res/layout/conversation_activity_attachment_keyboard_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.AttachmentKeyboard
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/attachment_keyboard"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_activity_emojidrawer_stub.xml b/app/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
index c52ae1d333..c8f16b5890 100644
--- a/app/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
+++ b/app/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.MediaKeyboard
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/emoji_drawer"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_activity_reminderview_stub.xml b/app/src/main/res/layout/conversation_activity_reminderview_stub.xml
index 3231d9b858..0fc2790cf5 100644
--- a/app/src/main/res/layout/conversation_activity_reminderview_stub.xml
+++ b/app/src/main/res/layout/conversation_activity_reminderview_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.reminder.ReminderView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/reminder"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_activity_unmute.xml b/app/src/main/res/layout/conversation_activity_unmute.xml
index 7fc6dabb1a..f2dfd007ce 100644
--- a/app/src/main/res/layout/conversation_activity_unmute.xml
+++ b/app/src/main/res/layout/conversation_activity_unmute.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/signal_colorSurface2">
diff --git a/app/src/main/res/layout/conversation_activity_unverified_banner_stub.xml b/app/src/main/res/layout/conversation_activity_unverified_banner_stub.xml
index 0ef0796716..1735ee5f2a 100644
--- a/app/src/main/res/layout/conversation_activity_unverified_banner_stub.xml
+++ b/app/src/main/res/layout/conversation_activity_unverified_banner_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.identity.UnverifiedBannerView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/unverified_banner"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_banner_view.xml b/app/src/main/res/layout/conversation_banner_view.xml
index 10511a3e87..416e8c8176 100644
--- a/app/src/main/res/layout/conversation_banner_view.xml
+++ b/app/src/main/res/layout/conversation_banner_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml b/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml
index 07ac266a52..d6b0ba3ad2 100644
--- a/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml
+++ b/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_fragment.xml b/app/src/main/res/layout/conversation_fragment.xml
index 2639366ca8..c3211bb296 100644
--- a/app/src/main/res/layout/conversation_fragment.xml
+++ b/app/src/main/res/layout/conversation_fragment.xml
@@ -2,6 +2,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/conversation_input_panel.xml b/app/src/main/res/layout/conversation_input_panel.xml
index 63ae3bebdf..adffcf5d57 100644
--- a/app/src/main/res/layout/conversation_input_panel.xml
+++ b/app/src/main/res/layout/conversation_input_panel.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputPanel xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_panel"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_banner.xml b/app/src/main/res/layout/conversation_item_banner.xml
index 9c8eebc4b7..a6eb1d7cf4 100644
--- a/app/src/main/res/layout/conversation_item_banner.xml
+++ b/app/src/main/res/layout/conversation_item_banner.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationBannerView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_call_to_action.xml b/app/src/main/res/layout/conversation_item_call_to_action.xml
index f1cc26ab08..b12b4072f6 100644
--- a/app/src/main/res/layout/conversation_item_call_to_action.xml
+++ b/app/src/main/res/layout/conversation_item_call_to_action.xml
@@ -1,5 +1,6 @@
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     style="@style/Signal.Widget.Button.Medium.Primary"
     android:id="@+id/conversation_item_call_to_action"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_footer_incoming.xml b/app/src/main/res/layout/conversation_item_footer_incoming.xml
index 7243c19a98..4c6dfb4e47 100644
--- a/app/src/main/res/layout/conversation_item_footer_incoming.xml
+++ b/app/src/main/res/layout/conversation_item_footer_incoming.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_item_footer_outgoing.xml b/app/src/main/res/layout/conversation_item_footer_outgoing.xml
index bead583fdc..825629b0bf 100644
--- a/app/src/main/res/layout/conversation_item_footer_outgoing.xml
+++ b/app/src/main/res/layout/conversation_item_footer_outgoing.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_item_header.xml b/app/src/main/res/layout/conversation_item_header.xml
index 19bcab758d..b7ebeee701 100644
--- a/app/src/main/res/layout/conversation_item_header.xml
+++ b/app/src/main/res/layout/conversation_item_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_item_last_seen.xml b/app/src/main/res/layout/conversation_item_last_seen.xml
index a92daa4db0..f26de09fa4 100644
--- a/app/src/main/res/layout/conversation_item_last_seen.xml
+++ b/app/src/main/res/layout/conversation_item_last_seen.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_item_received_audio.xml b/app/src/main/res/layout/conversation_item_received_audio.xml
index a80753fd0a..349cc71e2c 100644
--- a/app/src/main/res/layout/conversation_item_received_audio.xml
+++ b/app/src/main/res/layout/conversation_item_received_audio.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.AudioView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/audio_view"
     android:layout_width="@dimen/message_audio_width"
diff --git a/app/src/main/res/layout/conversation_item_received_document.xml b/app/src/main/res/layout/conversation_item_received_document.xml
index 1ef3d4bcaf..f404f21b49 100644
--- a/app/src/main/res/layout/conversation_item_received_document.xml
+++ b/app/src/main/res/layout/conversation_item_received_document.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.DocumentView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/document_view"
     android:layout_width="210dp"
diff --git a/app/src/main/res/layout/conversation_item_received_gift.xml b/app/src/main/res/layout/conversation_item_received_gift.xml
index 8373c0f3ab..02ea43557d 100644
--- a/app/src/main/res/layout/conversation_item_received_gift.xml
+++ b/app/src/main/res/layout/conversation_item_received_gift.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.badges.gifts.GiftMessageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_received_link_preview.xml b/app/src/main/res/layout/conversation_item_received_link_preview.xml
index 3c49d6a421..e6fb825a65 100644
--- a/app/src/main/res/layout/conversation_item_received_link_preview.xml
+++ b/app/src/main/res/layout/conversation_item_received_link_preview.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.LinkPreviewView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/link_preview"
diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index efa889001b..9694bbaef8 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_item"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_received_revealable.xml b/app/src/main/res/layout/conversation_item_received_revealable.xml
index c1bff92ef1..41f6128595 100644
--- a/app/src/main/res/layout/conversation_item_received_revealable.xml
+++ b/app/src/main/res/layout/conversation_item_received_revealable.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.revealable.ViewOnceMessageView
         xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/revealable_view"
diff --git a/app/src/main/res/layout/conversation_item_received_shared_contact.xml b/app/src/main/res/layout/conversation_item_received_shared_contact.xml
index edd4159632..5411d9f838 100644
--- a/app/src/main/res/layout/conversation_item_received_shared_contact.xml
+++ b/app/src/main/res/layout/conversation_item_received_shared_contact.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SharedContactView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/shared_contact_view"
diff --git a/app/src/main/res/layout/conversation_item_received_sticker.xml b/app/src/main/res/layout/conversation_item_received_sticker.xml
index 19a5b1c504..815b530d75 100644
--- a/app/src/main/res/layout/conversation_item_received_sticker.xml
+++ b/app/src/main/res/layout/conversation_item_received_sticker.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.BorderlessImageView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/image_view"
     android:layout_width="@dimen/media_bubble_sticker_dimens"
diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml
index a52b9be45b..24fcee604f 100644
--- a/app/src/main/res/layout/conversation_item_received_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_received_text_only.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_item"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_received_thumbnail.xml b/app/src/main/res/layout/conversation_item_received_thumbnail.xml
index 6416efb0db..cced3718d8 100644
--- a/app/src/main/res/layout/conversation_item_received_thumbnail.xml
+++ b/app/src/main/res/layout/conversation_item_received_thumbnail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ConversationItemThumbnail
         xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/image_view"
diff --git a/app/src/main/res/layout/conversation_item_sent_audio.xml b/app/src/main/res/layout/conversation_item_sent_audio.xml
index 495a6c87c3..fa7ce6dc9e 100644
--- a/app/src/main/res/layout/conversation_item_sent_audio.xml
+++ b/app/src/main/res/layout/conversation_item_sent_audio.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.AudioView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/audio_view"
     android:layout_width="@dimen/message_audio_width"
diff --git a/app/src/main/res/layout/conversation_item_sent_document.xml b/app/src/main/res/layout/conversation_item_sent_document.xml
index cbabeae29b..2b55f4670f 100644
--- a/app/src/main/res/layout/conversation_item_sent_document.xml
+++ b/app/src/main/res/layout/conversation_item_sent_document.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.DocumentView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/document_view"
     android:layout_width="210dp"
diff --git a/app/src/main/res/layout/conversation_item_sent_gift.xml b/app/src/main/res/layout/conversation_item_sent_gift.xml
index e1576218e9..b8c010727c 100644
--- a/app/src/main/res/layout/conversation_item_sent_gift.xml
+++ b/app/src/main/res/layout/conversation_item_sent_gift.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.badges.gifts.GiftMessageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_sent_link_preview.xml b/app/src/main/res/layout/conversation_item_sent_link_preview.xml
index 3c49d6a421..e6fb825a65 100644
--- a/app/src/main/res/layout/conversation_item_sent_link_preview.xml
+++ b/app/src/main/res/layout/conversation_item_sent_link_preview.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.LinkPreviewView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/link_preview"
diff --git a/app/src/main/res/layout/conversation_item_sent_multimedia.xml b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
index 22607881d3..1a1f8023b4 100644
--- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_item"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_sent_revealable.xml b/app/src/main/res/layout/conversation_item_sent_revealable.xml
index 357e1f4af9..cf2186670a 100644
--- a/app/src/main/res/layout/conversation_item_sent_revealable.xml
+++ b/app/src/main/res/layout/conversation_item_sent_revealable.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.revealable.ViewOnceMessageView
         xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/revealable_view"
diff --git a/app/src/main/res/layout/conversation_item_sent_shared_contact.xml b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml
index c29bd26d72..59a2225ed5 100644
--- a/app/src/main/res/layout/conversation_item_sent_shared_contact.xml
+++ b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SharedContactView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/shared_contact_view"
diff --git a/app/src/main/res/layout/conversation_item_sent_sticker.xml b/app/src/main/res/layout/conversation_item_sent_sticker.xml
index 19a5b1c504..815b530d75 100644
--- a/app/src/main/res/layout/conversation_item_sent_sticker.xml
+++ b/app/src/main/res/layout/conversation_item_sent_sticker.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.BorderlessImageView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/image_view"
     android:layout_width="@dimen/media_bubble_sticker_dimens"
diff --git a/app/src/main/res/layout/conversation_item_sent_text_only.xml b/app/src/main/res/layout/conversation_item_sent_text_only.xml
index 6b7d3d1ae9..16f3e18827 100644
--- a/app/src/main/res/layout/conversation_item_sent_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_sent_text_only.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_item"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_item_sent_thumbnail.xml b/app/src/main/res/layout/conversation_item_sent_thumbnail.xml
index 052c5713b8..d2f5f8fb35 100644
--- a/app/src/main/res/layout/conversation_item_sent_thumbnail.xml
+++ b/app/src/main/res/layout/conversation_item_sent_thumbnail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ConversationItemThumbnail
         xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/image_view"
diff --git a/app/src/main/res/layout/conversation_item_thumbnail.xml b/app/src/main/res/layout/conversation_item_thumbnail.xml
index 43082dffac..577302bff0 100644
--- a/app/src/main/res/layout/conversation_item_thumbnail.xml
+++ b/app/src/main/res/layout/conversation_item_thumbnail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/app/src/main/res/layout/conversation_item_update.xml b/app/src/main/res/layout/conversation_item_update.xml
index ba197f3b48..794083634e 100644
--- a/app/src/main/res/layout/conversation_item_update.xml
+++ b/app/src/main/res/layout/conversation_item_update.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationUpdateItem
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_update_item"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_list_archive_toolbar.xml b/app/src/main/res/layout/conversation_list_archive_toolbar.xml
index e9f4ad7612..47d4f467c1 100644
--- a/app/src/main/res/layout/conversation_list_archive_toolbar.xml
+++ b/app/src/main/res/layout/conversation_list_archive_toolbar.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/signal_m3_toolbar_height"
diff --git a/app/src/main/res/layout/conversation_list_empty_state.xml b/app/src/main/res/layout/conversation_list_empty_state.xml
index 7e8df85d02..18023953da 100644
--- a/app/src/main/res/layout/conversation_list_empty_state.xml
+++ b/app/src/main/res/layout/conversation_list_empty_state.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/empty_state"
diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index 60154cf255..5da58a4ea6 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -2,6 +2,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraint_layout"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_list_item_action.xml b/app/src/main/res/layout/conversation_list_item_action.xml
index 922d2d98d5..4836da8fef 100644
--- a/app/src/main/res/layout/conversation_list_item_action.xml
+++ b/app/src/main/res/layout/conversation_list_item_action.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversationlist.ConversationListItemAction xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="70dp">
 
diff --git a/app/src/main/res/layout/conversation_list_item_view.xml b/app/src/main/res/layout/conversation_list_item_view.xml
index e78185e65d..f6c56974d0 100644
--- a/app/src/main/res/layout/conversation_list_item_view.xml
+++ b/app/src/main/res/layout/conversation_list_item_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversationlist.ConversationListItem xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_list_megaphone_container.xml b/app/src/main/res/layout/conversation_list_megaphone_container.xml
index c435fe760e..526e03edb5 100644
--- a/app/src/main/res/layout/conversation_list_megaphone_container.xml
+++ b/app/src/main/res/layout/conversation_list_megaphone_container.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/megaphone_container"
diff --git a/app/src/main/res/layout/conversation_list_reminder_view.xml b/app/src/main/res/layout/conversation_list_reminder_view.xml
index 1af341fa65..5533196407 100644
--- a/app/src/main/res/layout/conversation_list_reminder_view.xml
+++ b/app/src/main/res/layout/conversation_list_reminder_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.reminder.ReminderView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/reminder"
diff --git a/app/src/main/res/layout/conversation_list_search_toolbar.xml b/app/src/main/res/layout/conversation_list_search_toolbar.xml
index 64216fa475..1471841fcb 100644
--- a/app/src/main/res/layout/conversation_list_search_toolbar.xml
+++ b/app/src/main/res/layout/conversation_list_search_toolbar.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.Material3SearchToolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/search_toolbar"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_list_tabs.xml b/app/src/main/res/layout/conversation_list_tabs.xml
index b52fadc752..ccbc6a31e4 100644
--- a/app/src/main/res/layout/conversation_list_tabs.xml
+++ b/app/src/main/res/layout/conversation_list_tabs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_mention_suggestions_stub.xml b/app/src/main/res/layout/conversation_mention_suggestions_stub.xml
index 17774789da..339713dc51 100644
--- a/app/src/main/res/layout/conversation_mention_suggestions_stub.xml
+++ b/app/src/main/res/layout/conversation_mention_suggestions_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:tag="mentions_picker_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/conversation_no_longer_a_member.xml b/app/src/main/res/layout/conversation_no_longer_a_member.xml
index 3f78d3a339..ba8661fe9c 100644
--- a/app/src/main/res/layout/conversation_no_longer_a_member.xml
+++ b/app/src/main/res/layout/conversation_no_longer_a_member.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/conversation_no_longer_member_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_parent_fragment_container.xml b/app/src/main/res/layout/conversation_parent_fragment_container.xml
index 90c9e68422..162e65229f 100644
--- a/app/src/main/res/layout/conversation_parent_fragment_container.xml
+++ b/app/src/main/res/layout/conversation_parent_fragment_container.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/conversation_reaction_scrubber.xml b/app/src/main/res/layout/conversation_reaction_scrubber.xml
index 78dd844808..375dade0df 100644
--- a/app/src/main/res/layout/conversation_reaction_scrubber.xml
+++ b/app/src/main/res/layout/conversation_reaction_scrubber.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationReactionOverlay xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_reaction_scrubber"
     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
index 45d3bf0d91..313999967c 100644
--- a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
+++ b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/conversation_requesting_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_scroll_to.xml b/app/src/main/res/layout/conversation_scroll_to.xml
index 53378f0797..29678e4618 100644
--- a/app/src/main/res/layout/conversation_scroll_to.xml
+++ b/app/src/main/res/layout/conversation_scroll_to.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.FrameLayout">
diff --git a/app/src/main/res/layout/conversation_search_nav.xml b/app/src/main/res/layout/conversation_search_nav.xml
index 2a4fcd1730..ee778ea0a6 100644
--- a/app/src/main/res/layout/conversation_search_nav.xml
+++ b/app/src/main/res/layout/conversation_search_nav.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ConversationSearchBottomBar
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_search_nav"
diff --git a/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml b/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml
index 0e41e0fb7c..21b4b2bfce 100644
--- a/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml
+++ b/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginTop="40dp"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_settings_bio_preference_item.xml b/app/src/main/res/layout/conversation_settings_bio_preference_item.xml
index cc8971e4e7..5b357776d5 100644
--- a/app/src/main/res/layout/conversation_settings_bio_preference_item.xml
+++ b/app/src/main/res/layout/conversation_settings_bio_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/conversation_settings_button_strip.xml b/app/src/main/res/layout/conversation_settings_button_strip.xml
index f79f7738e9..0968f4a6bd 100644
--- a/app/src/main/res/layout/conversation_settings_button_strip.xml
+++ b/app/src/main/res/layout/conversation_settings_button_strip.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_settings_fragment.xml b/app/src/main/res/layout/conversation_settings_fragment.xml
index 2c5e62179f..e74f5f7cdb 100644
--- a/app/src/main/res/layout/conversation_settings_fragment.xml
+++ b/app/src/main/res/layout/conversation_settings_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/conversation_settings_group_description_preference.xml b/app/src/main/res/layout/conversation_settings_group_description_preference.xml
index c2acb6f96a..d6f95ac24f 100644
--- a/app/src/main/res/layout/conversation_settings_group_description_preference.xml
+++ b/app/src/main/res/layout/conversation_settings_group_description_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.EmojiTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/manage_group_description"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_settings_internal_preference.xml b/app/src/main/res/layout/conversation_settings_internal_preference.xml
index 2d8298c034..c5b2182374 100644
--- a/app/src/main/res/layout/conversation_settings_internal_preference.xml
+++ b/app/src/main/res/layout/conversation_settings_internal_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/conversation_settings_legacy_group_preference.xml b/app/src/main/res/layout/conversation_settings_legacy_group_preference.xml
index 7bed9c3eee..eb75662664 100644
--- a/app/src/main/res/layout/conversation_settings_legacy_group_preference.xml
+++ b/app/src/main/res/layout/conversation_settings_legacy_group_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.util.views.LearnMoreTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/manage_group_info_text"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_settings_shared_media.xml b/app/src/main/res/layout/conversation_settings_shared_media.xml
index 7143406791..258fade0a6 100644
--- a/app/src/main/res/layout/conversation_settings_shared_media.xml
+++ b/app/src/main/res/layout/conversation_settings_shared_media.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ThreadPhotoRailView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/rail_view"
     android:layout_width="match_parent"
     android:layout_height="80dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/conversation_settings_toolbar.xml b/app/src/main/res/layout/conversation_settings_toolbar.xml
index 141ed548df..fbf55120de 100644
--- a/app/src/main/res/layout/conversation_settings_toolbar.xml
+++ b/app/src/main/res/layout/conversation_settings_toolbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/app/src/main/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml
index d9896d1248..887dd74607 100644
--- a/app/src/main/res/layout/conversation_title_view.xml
+++ b/app/src/main/res/layout/conversation_title_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.conversation.ConversationTitleView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_title_view"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/conversation_typing_view.xml b/app/src/main/res/layout/conversation_typing_view.xml
index 6c2354c1c0..0bad70e48f 100644
--- a/app/src/main/res/layout/conversation_typing_view.xml
+++ b/app/src/main/res/layout/conversation_typing_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ConversationTypingView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/country_code_text.xml b/app/src/main/res/layout/country_code_text.xml
index 5d30afb109..1da78b21c6 100644
--- a/app/src/main/res/layout/country_code_text.xml
+++ b/app/src/main/res/layout/country_code_text.xml
@@ -2,6 +2,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/country_list_item.xml b/app/src/main/res/layout/country_list_item.xml
index 202086eb74..43b590d917 100644
--- a/app/src/main/res/layout/country_list_item.xml
+++ b/app/src/main/res/layout/country_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/create_group_activity.xml b/app/src/main/res/layout/create_group_activity.xml
index 5cc051726b..71dbef2662 100644
--- a/app/src/main/res/layout/create_group_activity.xml
+++ b/app/src/main/res/layout/create_group_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/create_kbs_pin_activity.xml b/app/src/main/res/layout/create_kbs_pin_activity.xml
index f214f09a6b..fe96a194d2 100644
--- a/app/src/main/res/layout/create_kbs_pin_activity.xml
+++ b/app/src/main/res/layout/create_kbs_pin_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/create_passphrase_activity.xml b/app/src/main/res/layout/create_passphrase_activity.xml
index 4ef7856041..fa01e3972c 100644
--- a/app/src/main/res/layout/create_passphrase_activity.xml
+++ b/app/src/main/res/layout/create_passphrase_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/prompt_layout"
diff --git a/app/src/main/res/layout/create_payment_fragment.xml b/app/src/main/res/layout/create_payment_fragment.xml
index 428fa5c9cc..9ebc10eb88 100644
--- a/app/src/main/res/layout/create_payment_fragment.xml
+++ b/app/src/main/res/layout/create_payment_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/create_payment_fragment_amount.xml b/app/src/main/res/layout/create_payment_fragment_amount.xml
index ecef259464..cd7c8e577f 100644
--- a/app/src/main/res/layout/create_payment_fragment_amount.xml
+++ b/app/src/main/res/layout/create_payment_fragment_amount.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/create_payment_fragment_amount_toggle.xml b/app/src/main/res/layout/create_payment_fragment_amount_toggle.xml
index bda48b690b..95413ac69c 100644
--- a/app/src/main/res/layout/create_payment_fragment_amount_toggle.xml
+++ b/app/src/main/res/layout/create_payment_fragment_amount_toggle.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/create_story_flow_dialog_fragment.xml b/app/src/main/res/layout/create_story_flow_dialog_fragment.xml
index 1b37a84512..feeb93c633 100644
--- a/app/src/main/res/layout/create_story_flow_dialog_fragment.xml
+++ b/app/src/main/res/layout/create_story_flow_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/nav_host_fragment"
     android:name="androidx.navigation.fragment.NavHostFragment"
diff --git a/app/src/main/res/layout/cursor_adapter_header_footer_view.xml b/app/src/main/res/layout/cursor_adapter_header_footer_view.xml
index ee7f75473f..55c62fe210 100644
--- a/app/src/main/res/layout/cursor_adapter_header_footer_view.xml
+++ b/app/src/main/res/layout/cursor_adapter_header_footer_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/custom_chat_color_creator_fragment.xml b/app/src/main/res/layout/custom_chat_color_creator_fragment.xml
index 4b5c8aec13..2ebafdc069 100644
--- a/app/src/main/res/layout/custom_chat_color_creator_fragment.xml
+++ b/app/src/main/res/layout/custom_chat_color_creator_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/custom_chat_color_creator_fragment_page.xml b/app/src/main/res/layout/custom_chat_color_creator_fragment_page.xml
index e39388b12a..7c0bc3d743 100644
--- a/app/src/main/res/layout/custom_chat_color_creator_fragment_page.xml
+++ b/app/src/main/res/layout/custom_chat_color_creator_fragment_page.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll_view"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/custom_default_preference_dialog.xml b/app/src/main/res/layout/custom_default_preference_dialog.xml
index 8b02be4382..9992373ca3 100644
--- a/app/src/main/res/layout/custom_default_preference_dialog.xml
+++ b/app/src/main/res/layout/custom_default_preference_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/custom_expire_timer_select_dialog.xml b/app/src/main/res/layout/custom_expire_timer_select_dialog.xml
index a323b7fd1a..89e90caf32 100644
--- a/app/src/main/res/layout/custom_expire_timer_select_dialog.xml
+++ b/app/src/main/res/layout/custom_expire_timer_select_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/custom_expire_timer_selector_view.xml b/app/src/main/res/layout/custom_expire_timer_selector_view.xml
index 63aaa4e987..ad9fc9b031 100644
--- a/app/src/main/res/layout/custom_expire_timer_selector_view.xml
+++ b/app/src/main/res/layout/custom_expire_timer_selector_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     tools:orientation="horizontal"
     tools:parentTag="android.widget.LinearLayout">
 
diff --git a/app/src/main/res/layout/customizable_setting_edit_text.xml b/app/src/main/res/layout/customizable_setting_edit_text.xml
index 049b4eb78a..5e98ad7364 100644
--- a/app/src/main/res/layout/customizable_setting_edit_text.xml
+++ b/app/src/main/res/layout/customizable_setting_edit_text.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="20dp"
diff --git a/app/src/main/res/layout/customizable_single_select_item.xml b/app/src/main/res/layout/customizable_single_select_item.xml
index 039b309be8..cc4c9880db 100644
--- a/app/src/main/res/layout/customizable_single_select_item.xml
+++ b/app/src/main/res/layout/customizable_single_select_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/database_migration_activity.xml b/app/src/main/res/layout/database_migration_activity.xml
index b07ad6965f..72fc4f554a 100644
--- a/app/src/main/res/layout/database_migration_activity.xml
+++ b/app/src/main/res/layout/database_migration_activity.xml
@@ -2,6 +2,7 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
+    tools:viewBindingIgnore="true"
     android:layout_height="fill_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:fillViewport="true"
diff --git a/app/src/main/res/layout/deactivate_wallet_fragment.xml b/app/src/main/res/layout/deactivate_wallet_fragment.xml
index 2e25de458f..1ae7ea1029 100644
--- a/app/src/main/res/layout/deactivate_wallet_fragment.xml
+++ b/app/src/main/res/layout/deactivate_wallet_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/decryption_failed_dialog.xml b/app/src/main/res/layout/decryption_failed_dialog.xml
index e0ca5a3414..1ef4f77559 100644
--- a/app/src/main/res/layout/decryption_failed_dialog.xml
+++ b/app/src/main/res/layout/decryption_failed_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/delete_account_country_adapter_item.xml b/app/src/main/res/layout/delete_account_country_adapter_item.xml
index f0b6d2fa14..870492a692 100644
--- a/app/src/main/res/layout/delete_account_country_adapter_item.xml
+++ b/app/src/main/res/layout/delete_account_country_adapter_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@android:id/text1"
     style="?attr/spinnerDropDownItemStyle"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/delete_account_country_code_text.xml b/app/src/main/res/layout/delete_account_country_code_text.xml
index 942227e22f..850bfc08b1 100644
--- a/app/src/main/res/layout/delete_account_country_code_text.xml
+++ b/app/src/main/res/layout/delete_account_country_code_text.xml
@@ -2,6 +2,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/delete_account_country_picker.xml b/app/src/main/res/layout/delete_account_country_picker.xml
index 4c12e44500..165f766157 100644
--- a/app/src/main/res/layout/delete_account_country_picker.xml
+++ b/app/src/main/res/layout/delete_account_country_picker.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/delete_account_fragment.xml b/app/src/main/res/layout/delete_account_fragment.xml
index 8654e15466..e5f78f2a71 100644
--- a/app/src/main/res/layout/delete_account_fragment.xml
+++ b/app/src/main/res/layout/delete_account_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/delete_account_progress_dialog.xml b/app/src/main/res/layout/delete_account_progress_dialog.xml
index bfb707c58c..259ba0cc16 100644
--- a/app/src/main/res/layout/delete_account_progress_dialog.xml
+++ b/app/src/main/res/layout/delete_account_progress_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/delivery_status_view.xml b/app/src/main/res/layout/delivery_status_view.xml
index 97bb39a938..039fd54259 100644
--- a/app/src/main/res/layout/delivery_status_view.xml
+++ b/app/src/main/res/layout/delivery_status_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools">
+    tools:viewBindingIgnore="true"
 
     <ImageView
         android:id="@+id/pending_indicator"
diff --git a/app/src/main/res/layout/device_activity.xml b/app/src/main/res/layout/device_activity.xml
index 22a51e4fc3..e7dd5ceeed 100644
--- a/app/src/main/res/layout/device_activity.xml
+++ b/app/src/main/res/layout/device_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/device_add_fragment.xml b/app/src/main/res/layout/device_add_fragment.xml
index 64836f7fbb..bb0b270dec 100644
--- a/app/src/main/res/layout/device_add_fragment.xml
+++ b/app/src/main/res/layout/device_add_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/device_link_fragment.xml b/app/src/main/res/layout/device_link_fragment.xml
index 87e86ad017..aff199c106 100644
--- a/app/src/main/res/layout/device_link_fragment.xml
+++ b/app/src/main/res/layout/device_link_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/device_list_fragment.xml b/app/src/main/res/layout/device_list_fragment.xml
index 457ba1c203..82e77f04e8 100644
--- a/app/src/main/res/layout/device_list_fragment.xml
+++ b/app/src/main/res/layout/device_list_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/device_list_item_view.xml b/app/src/main/res/layout/device_list_item_view.xml
index 5f1288500f..5022722c1c 100644
--- a/app/src/main/res/layout/device_list_item_view.xml
+++ b/app/src/main/res/layout/device_list_item_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.DeviceListItem xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
                                            android:orientation="vertical"
                                            android:layout_width="match_parent"
                                            android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/device_transfer_fragment.xml b/app/src/main/res/layout/device_transfer_fragment.xml
index aa30817cb1..627cc63b29 100644
--- a/app/src/main/res/layout/device_transfer_fragment.xml
+++ b/app/src/main/res/layout/device_transfer_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/device_transfer_setup_fragment.xml b/app/src/main/res/layout/device_transfer_setup_fragment.xml
index fc8e446fba..a1f1f1531c 100644
--- a/app/src/main/res/layout/device_transfer_setup_fragment.xml
+++ b/app/src/main/res/layout/device_transfer_setup_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/device_transfer_setup_troubleshooting_layout.xml b/app/src/main/res/layout/device_transfer_setup_troubleshooting_layout.xml
index 8093b277a2..605d4cd3c1 100644
--- a/app/src/main/res/layout/device_transfer_setup_troubleshooting_layout.xml
+++ b/app/src/main/res/layout/device_transfer_setup_troubleshooting_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/device_transfer_setup_verify_layout.xml b/app/src/main/res/layout/device_transfer_setup_verify_layout.xml
index 85da00d338..6ee5d78bf2 100644
--- a/app/src/main/res/layout/device_transfer_setup_verify_layout.xml
+++ b/app/src/main/res/layout/device_transfer_setup_verify_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/device_transfer_setup_waiting_for_other_verify_layout.xml b/app/src/main/res/layout/device_transfer_setup_waiting_for_other_verify_layout.xml
index 190762d427..88512bac80 100644
--- a/app/src/main/res/layout/device_transfer_setup_waiting_for_other_verify_layout.xml
+++ b/app/src/main/res/layout/device_transfer_setup_waiting_for_other_verify_layout.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/dialog_group_members.xml b/app/src/main/res/layout/dialog_group_members.xml
index d169253bea..391181fd50 100644
--- a/app/src/main/res/layout/dialog_group_members.xml
+++ b/app/src/main/res/layout/dialog_group_members.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/dialog_multiple_group_invites_sent.xml b/app/src/main/res/layout/dialog_multiple_group_invites_sent.xml
index 90d6b5374e..3b72828894 100644
--- a/app/src/main/res/layout/dialog_multiple_group_invites_sent.xml
+++ b/app/src/main/res/layout/dialog_multiple_group_invites_sent.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/dialog_multiple_members_non_gv2_capable.xml b/app/src/main/res/layout/dialog_multiple_members_non_gv2_capable.xml
index 0d232ed110..b6a486a410 100644
--- a/app/src/main/res/layout/dialog_multiple_members_non_gv2_capable.xml
+++ b/app/src/main/res/layout/dialog_multiple_members_non_gv2_capable.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/display_story_or_profile_image_dialog.xml b/app/src/main/res/layout/display_story_or_profile_image_dialog.xml
index b4217ddeb0..e21ad72b39 100644
--- a/app/src/main/res/layout/display_story_or_profile_image_dialog.xml
+++ b/app/src/main/res/layout/display_story_or_profile_image_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/document_view.xml b/app/src/main/res/layout/document_view.xml
index 7a4a634961..35ff360e31 100644
--- a/app/src/main/res/layout/document_view.xml
+++ b/app/src/main/res/layout/document_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        tools:context="org.thoughtcrime.securesms.components.DocumentView">
 
diff --git a/app/src/main/res/layout/donate_preference_widget.xml b/app/src/main/res/layout/donate_preference_widget.xml
index 70ed9737f6..589dd48993 100644
--- a/app/src/main/res/layout/donate_preference_widget.xml
+++ b/app/src/main/res/layout/donate_preference_widget.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/donation_receipt_detail_fragment.xml b/app/src/main/res/layout/donation_receipt_detail_fragment.xml
index d6c5754547..48c2283d75 100644
--- a/app/src/main/res/layout/donation_receipt_detail_fragment.xml
+++ b/app/src/main/res/layout/donation_receipt_detail_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/donation_receipt_list_fragment.xml b/app/src/main/res/layout/donation_receipt_list_fragment.xml
index 208690c0d6..a36c254f7a 100644
--- a/app/src/main/res/layout/donation_receipt_list_fragment.xml
+++ b/app/src/main/res/layout/donation_receipt_list_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/donation_receipt_list_item.xml b/app/src/main/res/layout/donation_receipt_list_item.xml
index 9b77f970e9..036c161811 100644
--- a/app/src/main/res/layout/donation_receipt_list_item.xml
+++ b/app/src/main/res/layout/donation_receipt_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/donation_receipt_list_page_fragment.xml b/app/src/main/res/layout/donation_receipt_list_page_fragment.xml
index c43f5e3e1a..3fa32bc85a 100644
--- a/app/src/main/res/layout/donation_receipt_list_page_fragment.xml
+++ b/app/src/main/res/layout/donation_receipt_list_page_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/donation_receipt_png.xml b/app/src/main/res/layout/donation_receipt_png.xml
index 676bdd5e5f..5824827430 100644
--- a/app/src/main/res/layout/donation_receipt_png.xml
+++ b/app/src/main/res/layout/donation_receipt_png.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="2180px"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_async_switch_preference_item.xml b/app/src/main/res/layout/dsl_async_switch_preference_item.xml
index d391f5b59c..b218ff909b 100644
--- a/app/src/main/res/layout/dsl_async_switch_preference_item.xml
+++ b/app/src/main/res/layout/dsl_async_switch_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_button_primary.xml b/app/src/main/res/layout/dsl_button_primary.xml
index 722993245c..a206c6fab4 100644
--- a/app/src/main/res/layout/dsl_button_primary.xml
+++ b/app/src/main/res/layout/dsl_button_primary.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/button"
     style="@style/Signal.Widget.Button.Large.Primary"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dsl_button_secondary.xml b/app/src/main/res/layout/dsl_button_secondary.xml
index 55f09fc19e..8fd6686060 100644
--- a/app/src/main/res/layout/dsl_button_secondary.xml
+++ b/app/src/main/res/layout/dsl_button_secondary.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/button"
     style="@style/Signal.Widget.Button.Large.Secondary"
diff --git a/app/src/main/res/layout/dsl_button_tonal.xml b/app/src/main/res/layout/dsl_button_tonal.xml
index 1ad535f543..85ef11b623 100644
--- a/app/src/main/res/layout/dsl_button_tonal.xml
+++ b/app/src/main/res/layout/dsl_button_tonal.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/dsl_divider_item.xml b/app/src/main/res/layout/dsl_divider_item.xml
index 87bbc4e22e..7d15f87d1c 100644
--- a/app/src/main/res/layout/dsl_divider_item.xml
+++ b/app/src/main/res/layout/dsl_divider_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/dsl_learn_more_preference_item.xml b/app/src/main/res/layout/dsl_learn_more_preference_item.xml
index ef43bcb1bd..3eb192953c 100644
--- a/app/src/main/res/layout/dsl_learn_more_preference_item.xml
+++ b/app/src/main/res/layout/dsl_learn_more_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_multiline_text_input.xml b/app/src/main/res/layout/dsl_multiline_text_input.xml
index 563b45d5a7..99c9856645 100644
--- a/app/src/main/res/layout/dsl_multiline_text_input.xml
+++ b/app/src/main/res/layout/dsl_multiline_text_input.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/dsl_payments_preference.xml b/app/src/main/res/layout/dsl_payments_preference.xml
index 7e6181f6e8..9f87719086 100644
--- a/app/src/main/res/layout/dsl_payments_preference.xml
+++ b/app/src/main/res/layout/dsl_payments_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_preference_item.xml b/app/src/main/res/layout/dsl_preference_item.xml
index 3a80900c0f..f832f36b47 100644
--- a/app/src/main/res/layout/dsl_preference_item.xml
+++ b/app/src/main/res/layout/dsl_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_progress_pref.xml b/app/src/main/res/layout/dsl_progress_pref.xml
index d151eaa66a..293bc8db03 100644
--- a/app/src/main/res/layout/dsl_progress_pref.xml
+++ b/app/src/main/res/layout/dsl_progress_pref.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/dsl_radio_preference_item.xml b/app/src/main/res/layout/dsl_radio_preference_item.xml
index 105c2c38e5..6b7e01a2ca 100644
--- a/app/src/main/res/layout/dsl_radio_preference_item.xml
+++ b/app/src/main/res/layout/dsl_radio_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_section_header.xml b/app/src/main/res/layout/dsl_section_header.xml
index b41785634a..bb5a38d2cb 100644
--- a/app/src/main/res/layout/dsl_section_header.xml
+++ b/app/src/main/res/layout/dsl_section_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="48dp"
diff --git a/app/src/main/res/layout/dsl_settings_activity.xml b/app/src/main/res/layout/dsl_settings_activity.xml
index a2bf315761..e34341efe4 100644
--- a/app/src/main/res/layout/dsl_settings_activity.xml
+++ b/app/src/main/res/layout/dsl_settings_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/nav_host_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dsl_settings_bottom_sheet.xml b/app/src/main/res/layout/dsl_settings_bottom_sheet.xml
index 04bf7fd2da..25d49ba461 100644
--- a/app/src/main/res/layout/dsl_settings_bottom_sheet.xml
+++ b/app/src/main/res/layout/dsl_settings_bottom_sheet.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/dsl_settings_bottom_sheet_no_handle.xml b/app/src/main/res/layout/dsl_settings_bottom_sheet_no_handle.xml
index c10847331e..8b27c2b23c 100644
--- a/app/src/main/res/layout/dsl_settings_bottom_sheet_no_handle.xml
+++ b/app/src/main/res/layout/dsl_settings_bottom_sheet_no_handle.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/recycler"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dsl_settings_fragment.xml b/app/src/main/res/layout/dsl_settings_fragment.xml
index 2e2c4bc3de..f09a1d2396 100644
--- a/app/src/main/res/layout/dsl_settings_fragment.xml
+++ b/app/src/main/res/layout/dsl_settings_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/dsl_settings_toolbar.xml b/app/src/main/res/layout/dsl_settings_toolbar.xml
index 38493bfde6..00342db82e 100644
--- a/app/src/main/res/layout/dsl_settings_toolbar.xml
+++ b/app/src/main/res/layout/dsl_settings_toolbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/app/src/main/res/layout/dsl_space_preference.xml b/app/src/main/res/layout/dsl_space_preference.xml
index e4437df619..4ced73804a 100644
--- a/app/src/main/res/layout/dsl_space_preference.xml
+++ b/app/src/main/res/layout/dsl_space_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/space"
     android:layout_width="match_parent"
     android:layout_height="0dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dsl_switch_preference_item.xml b/app/src/main/res/layout/dsl_switch_preference_item.xml
index c9bbdf1553..729ffda87f 100644
--- a/app/src/main/res/layout/dsl_switch_preference_item.xml
+++ b/app/src/main/res/layout/dsl_switch_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dsl_text_preference.xml b/app/src/main/res/layout/dsl_text_preference.xml
index 3bbce6a2db..ce9340141d 100644
--- a/app/src/main/res/layout/dsl_text_preference.xml
+++ b/app/src/main/res/layout/dsl_text_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/edit_about_fragment.xml b/app/src/main/res/layout/edit_about_fragment.xml
index ae8c2b87b3..37bcb4827d 100644
--- a/app/src/main/res/layout/edit_about_fragment.xml
+++ b/app/src/main/res/layout/edit_about_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/edit_note_fragment.xml b/app/src/main/res/layout/edit_note_fragment.xml
index 6b6ffafb4b..0e59bc969a 100644
--- a/app/src/main/res/layout/edit_note_fragment.xml
+++ b/app/src/main/res/layout/edit_note_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/edit_profile_name_fragment.xml b/app/src/main/res/layout/edit_profile_name_fragment.xml
index 718895a5ae..1a5a73430b 100644
--- a/app/src/main/res/layout/edit_profile_name_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_name_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/edit_proxy_fragment.xml b/app/src/main/res/layout/edit_proxy_fragment.xml
index 2a533f1ff6..30daebaebe 100644
--- a/app/src/main/res/layout/edit_proxy_fragment.xml
+++ b/app/src/main/res/layout/edit_proxy_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/edit_reactions_fragment.xml b/app/src/main/res/layout/edit_reactions_fragment.xml
index 2c37f3dd13..d4b99111f3 100644
--- a/app/src/main/res/layout/edit_reactions_fragment.xml
+++ b/app/src/main/res/layout/edit_reactions_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/emoji_display_item_grid.xml b/app/src/main/res/layout/emoji_display_item_grid.xml
index 9ce06a28d5..ad7e28ce36 100644
--- a/app/src/main/res/layout/emoji_display_item_grid.xml
+++ b/app/src/main/res/layout/emoji_display_item_grid.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/layout/emoji_display_item_list.xml b/app/src/main/res/layout/emoji_display_item_list.xml
index 3e2ba98149..d5c875e370 100644
--- a/app/src/main/res/layout/emoji_display_item_list.xml
+++ b/app/src/main/res/layout/emoji_display_item_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:background="?selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/layout/emoji_grid_header.xml b/app/src/main/res/layout/emoji_grid_header.xml
index 6b9dccef98..dd928708b4 100644
--- a/app/src/main/res/layout/emoji_grid_header.xml
+++ b/app/src/main/res/layout/emoji_grid_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/emoji_grid_header_title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/emoji_grid_no_results.xml b/app/src/main/res/layout/emoji_grid_no_results.xml
index d2eb0c3c2f..e024c005f6 100644
--- a/app/src/main/res/layout/emoji_grid_no_results.xml
+++ b/app/src/main/res/layout/emoji_grid_no_results.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
diff --git a/app/src/main/res/layout/emoji_search_fragment.xml b/app/src/main/res/layout/emoji_search_fragment.xml
index 65d5ba079c..1bd7e5cb25 100644
--- a/app/src/main/res/layout/emoji_search_fragment.xml
+++ b/app/src/main/res/layout/emoji_search_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/kb_aware_layout"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/emoji_text_display_item_grid.xml b/app/src/main/res/layout/emoji_text_display_item_grid.xml
index 32555bfe65..22dc81e4b7 100644
--- a/app/src/main/res/layout/emoji_text_display_item_grid.xml
+++ b/app/src/main/res/layout/emoji_text_display_item_grid.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/layout/emoji_text_display_item_list.xml b/app/src/main/res/layout/emoji_text_display_item_list.xml
index b71d96c77e..03fed5fb1a 100644
--- a/app/src/main/res/layout/emoji_text_display_item_list.xml
+++ b/app/src/main/res/layout/emoji_text_display_item_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:background="?selectableItemBackgroundBorderless"
diff --git a/app/src/main/res/layout/emoji_variation_selector.xml b/app/src/main/res/layout/emoji_variation_selector.xml
index 7dc89d54af..2ead84607c 100644
--- a/app/src/main/res/layout/emoji_variation_selector.xml
+++ b/app/src/main/res/layout/emoji_variation_selector.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <HorizontalScrollView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/emoji_variation_selector_item.xml b/app/src/main/res/layout/emoji_variation_selector_item.xml
index 5fb46b900f..2c1f0fcf7d 100644
--- a/app/src/main/res/layout/emoji_variation_selector_item.xml
+++ b/app/src/main/res/layout/emoji_variation_selector_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="50dp"
     android:layout_height="50dp"
diff --git a/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml b/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml
index 075132a598..e05fa3df7f 100644
--- a/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml
+++ b/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/enter_backup_passphrase_dialog.xml b/app/src/main/res/layout/enter_backup_passphrase_dialog.xml
index d0aa087bb7..763f6c6089 100644
--- a/app/src/main/res/layout/enter_backup_passphrase_dialog.xml
+++ b/app/src/main/res/layout/enter_backup_passphrase_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="16dp">
diff --git a/app/src/main/res/layout/expand_header.xml b/app/src/main/res/layout/expand_header.xml
index 6414ac740f..c19a6da9c1 100644
--- a/app/src/main/res/layout/expand_header.xml
+++ b/app/src/main/res/layout/expand_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/expiration_dialog.xml b/app/src/main/res/layout/expiration_dialog.xml
index fd2b1f1416..6552418348 100644
--- a/app/src/main/res/layout/expiration_dialog.xml
+++ b/app/src/main/res/layout/expiration_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/expiration_timer_badge.xml b/app/src/main/res/layout/expiration_timer_badge.xml
index e7b2ccf515..5eef9db331 100644
--- a/app/src/main/res/layout/expiration_timer_badge.xml
+++ b/app/src/main/res/layout/expiration_timer_badge.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/expiration_badge_container"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/expire_timer_settings_fragment.xml b/app/src/main/res/layout/expire_timer_settings_fragment.xml
index 59f70b4db5..25427e81e0 100644
--- a/app/src/main/res/layout/expire_timer_settings_fragment.xml
+++ b/app/src/main/res/layout/expire_timer_settings_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
diff --git a/app/src/main/res/layout/expired_badge_preference.xml b/app/src/main/res/layout/expired_badge_preference.xml
index 7604296e6a..915c3240bf 100644
--- a/app/src/main/res/layout/expired_badge_preference.xml
+++ b/app/src/main/res/layout/expired_badge_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/featured_badge_preview_preference.xml b/app/src/main/res/layout/featured_badge_preview_preference.xml
index cc8964955d..595461ad12 100644
--- a/app/src/main/res/layout/featured_badge_preview_preference.xml
+++ b/app/src/main/res/layout/featured_badge_preview_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/fragment_add_allowed_members.xml b/app/src/main/res/layout/fragment_add_allowed_members.xml
index 75d8c802c1..1153250d44 100644
--- a/app/src/main/res/layout/fragment_add_allowed_members.xml
+++ b/app/src/main/res/layout/fragment_add_allowed_members.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_backups.xml b/app/src/main/res/layout/fragment_backups.xml
index ee4d1093b4..ef935a257c 100644
--- a/app/src/main/res/layout/fragment_backups.xml
+++ b/app/src/main/res/layout/fragment_backups.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_number_account_locked.xml b/app/src/main/res/layout/fragment_change_number_account_locked.xml
index e178d4523d..db135a35a5 100644
--- a/app/src/main/res/layout/fragment_change_number_account_locked.xml
+++ b/app/src/main/res/layout/fragment_change_number_account_locked.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_number_confirm.xml b/app/src/main/res/layout/fragment_change_number_confirm.xml
index 19ee75fd7c..898fa2f01b 100644
--- a/app/src/main/res/layout/fragment_change_number_confirm.xml
+++ b/app/src/main/res/layout/fragment_change_number_confirm.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_number_enter_code.xml b/app/src/main/res/layout/fragment_change_number_enter_code.xml
index 4a9a198e43..ec6f8f7174 100644
--- a/app/src/main/res/layout/fragment_change_number_enter_code.xml
+++ b/app/src/main/res/layout/fragment_change_number_enter_code.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml b/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml
index 2de821b8eb..b51ec13df8 100644
--- a/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml
+++ b/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_number_pin_differs.xml b/app/src/main/res/layout/fragment_change_number_pin_differs.xml
index e6aa17c301..64d501b3fb 100644
--- a/app/src/main/res/layout/fragment_change_number_pin_differs.xml
+++ b/app/src/main/res/layout/fragment_change_number_pin_differs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_change_number_registration_lock.xml b/app/src/main/res/layout/fragment_change_number_registration_lock.xml
index ddcbee4434..34d59f593a 100644
--- a/app/src/main/res/layout/fragment_change_number_registration_lock.xml
+++ b/app/src/main/res/layout/fragment_change_number_registration_lock.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_phone_number.xml b/app/src/main/res/layout/fragment_change_phone_number.xml
index 559404fa1e..8ca3153f7c 100644
--- a/app/src/main/res/layout/fragment_change_phone_number.xml
+++ b/app/src/main/res/layout/fragment_change_phone_number.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_change_phone_number_verify.xml b/app/src/main/res/layout/fragment_change_phone_number_verify.xml
index 91729abe4d..199272e551 100644
--- a/app/src/main/res/layout/fragment_change_phone_number_verify.xml
+++ b/app/src/main/res/layout/fragment_change_phone_number_verify.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_container.xml b/app/src/main/res/layout/fragment_container.xml
index 90c9e68422..162e65229f 100644
--- a/app/src/main/res/layout/fragment_container.xml
+++ b/app/src/main/res/layout/fragment_container.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_edit_notification_profile.xml b/app/src/main/res/layout/fragment_edit_notification_profile.xml
index b7d8336579..f57f62373d 100644
--- a/app/src/main/res/layout/fragment_edit_notification_profile.xml
+++ b/app/src/main/res/layout/fragment_edit_notification_profile.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml b/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml
index b8213d53e7..dbecacad82 100644
--- a/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml
+++ b/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_notification_profile_created.xml b/app/src/main/res/layout/fragment_notification_profile_created.xml
index 81ad96bf53..1c2413d480 100644
--- a/app/src/main/res/layout/fragment_notification_profile_created.xml
+++ b/app/src/main/res/layout/fragment_notification_profile_created.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_notification_profiles.xml b/app/src/main/res/layout/fragment_notification_profiles.xml
index 5f85c0670c..c92bae5dbd 100644
--- a/app/src/main/res/layout/fragment_notification_profiles.xml
+++ b/app/src/main/res/layout/fragment_notification_profiles.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/fragment_registration_blank.xml b/app/src/main/res/layout/fragment_registration_blank.xml
index e24c3b5a5b..94d3e682f5 100644
--- a/app/src/main/res/layout/fragment_registration_blank.xml
+++ b/app/src/main/res/layout/fragment_registration_blank.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_captcha.xml b/app/src/main/res/layout/fragment_registration_captcha.xml
index da14d9175e..6e4cbf78ea 100644
--- a/app/src/main/res/layout/fragment_registration_captcha.xml
+++ b/app/src/main/res/layout/fragment_registration_captcha.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_choose_backup.xml b/app/src/main/res/layout/fragment_registration_choose_backup.xml
index 852eb9ad7c..9464eb729f 100644
--- a/app/src/main/res/layout/fragment_registration_choose_backup.xml
+++ b/app/src/main/res/layout/fragment_registration_choose_backup.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_registration_country_picker.xml b/app/src/main/res/layout/fragment_registration_country_picker.xml
index 2e0583aa54..f7f1fc1cbb 100644
--- a/app/src/main/res/layout/fragment_registration_country_picker.xml
+++ b/app/src/main/res/layout/fragment_registration_country_picker.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/fragment_registration_enter_code.xml b/app/src/main/res/layout/fragment_registration_enter_code.xml
index 6083667560..4da105e4f4 100644
--- a/app/src/main/res/layout/fragment_registration_enter_code.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_code.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
index fe5e0835c8..08cf7ce730 100644
--- a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/scroll_view"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_lock.xml b/app/src/main/res/layout/fragment_registration_lock.xml
index 8a90e202b4..fdbbf06909 100644
--- a/app/src/main/res/layout/fragment_registration_lock.xml
+++ b/app/src/main/res/layout/fragment_registration_lock.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_restore_backup.xml b/app/src/main/res/layout/fragment_registration_restore_backup.xml
index 238cba57f3..00fb3c6e28 100644
--- a/app/src/main/res/layout/fragment_registration_restore_backup.xml
+++ b/app/src/main/res/layout/fragment_registration_restore_backup.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_welcome.xml b/app/src/main/res/layout/fragment_registration_welcome.xml
index eedbde2fbc..1035eae7ac 100644
--- a/app/src/main/res/layout/fragment_registration_welcome.xml
+++ b/app/src/main/res/layout/fragment_registration_welcome.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_review.xml b/app/src/main/res/layout/fragment_review.xml
index 3534ed88cd..80d0dd1046 100644
--- a/app/src/main/res/layout/fragment_review.xml
+++ b/app/src/main/res/layout/fragment_review.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_select_recipients_fragment.xml b/app/src/main/res/layout/fragment_select_recipients_fragment.xml
index b4bf907581..58905869c1 100644
--- a/app/src/main/res/layout/fragment_select_recipients_fragment.xml
+++ b/app/src/main/res/layout/fragment_select_recipients_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_transfer_restore.xml b/app/src/main/res/layout/fragment_transfer_restore.xml
index 606d88d8ad..0ccaca824c 100644
--- a/app/src/main/res/layout/fragment_transfer_restore.xml
+++ b/app/src/main/res/layout/fragment_transfer_restore.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/full_screen_dialog_fragment.xml b/app/src/main/res/layout/full_screen_dialog_fragment.xml
index e49f52b029..6ba53d1709 100644
--- a/app/src/main/res/layout/full_screen_dialog_fragment.xml
+++ b/app/src/main/res/layout/full_screen_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/gif_keyboard_page_fragment.xml b/app/src/main/res/layout/gif_keyboard_page_fragment.xml
index 647074627e..050198bc57 100644
--- a/app/src/main/res/layout/gif_keyboard_page_fragment.xml
+++ b/app/src/main/res/layout/gif_keyboard_page_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/gif_player.xml b/app/src/main/res/layout/gif_player.xml
index a345f9e51d..f722a29b38 100644
--- a/app/src/main/res/layout/gif_player.xml
+++ b/app/src/main/res/layout/gif_player.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/gift_badge_preview_preference.xml b/app/src/main/res/layout/gift_badge_preview_preference.xml
index df563eed51..10d279eaf1 100644
--- a/app/src/main/res/layout/gift_badge_preview_preference.xml
+++ b/app/src/main/res/layout/gift_badge_preview_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/gift_flow_confirmation_content.xml b/app/src/main/res/layout/gift_flow_confirmation_content.xml
index 4009492759..a1aac30e0f 100644
--- a/app/src/main/res/layout/gift_flow_confirmation_content.xml
+++ b/app/src/main/res/layout/gift_flow_confirmation_content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/app/src/main/res/layout/gift_flow_confirmation_fragment.xml b/app/src/main/res/layout/gift_flow_confirmation_fragment.xml
index a9a58eeac7..a40eddd797 100644
--- a/app/src/main/res/layout/gift_flow_confirmation_fragment.xml
+++ b/app/src/main/res/layout/gift_flow_confirmation_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/input_aware_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml b/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml
index a48f7eb2eb..39bc9b3cc0 100644
--- a/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/gift_flow_start_fragment.xml b/app/src/main/res/layout/gift_flow_start_fragment.xml
index cbee94cb42..4a70759b6e 100644
--- a/app/src/main/res/layout/gift_flow_start_fragment.xml
+++ b/app/src/main/res/layout/gift_flow_start_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/gift_message_view.xml b/app/src/main/res/layout/gift_message_view.xml
index 8278f9c7ec..9685fcd575 100644
--- a/app/src/main/res/layout/gift_message_view.xml
+++ b/app/src/main/res/layout/gift_message_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/giphy_activity.xml b/app/src/main/res/layout/giphy_activity.xml
index 0e54a4d28f..8857935dde 100644
--- a/app/src/main/res/layout/giphy_activity.xml
+++ b/app/src/main/res/layout/giphy_activity.xml
@@ -1,5 +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"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/giphy_activity_toolbar.xml b/app/src/main/res/layout/giphy_activity_toolbar.xml
index 5dc0fa71ca..a5a1c29bce 100644
--- a/app/src/main/res/layout/giphy_activity_toolbar.xml
+++ b/app/src/main/res/layout/giphy_activity_toolbar.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
diff --git a/app/src/main/res/layout/giphy_mp4.xml b/app/src/main/res/layout/giphy_mp4.xml
index 226483d65f..0f75de165a 100644
--- a/app/src/main/res/layout/giphy_mp4.xml
+++ b/app/src/main/res/layout/giphy_mp4.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/giphy_mp4_fragment.xml b/app/src/main/res/layout/giphy_mp4_fragment.xml
index 198e362954..42382b4f2a 100644
--- a/app/src/main/res/layout/giphy_mp4_fragment.xml
+++ b/app/src/main/res/layout/giphy_mp4_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/giphy_mp4_player.xml b/app/src/main/res/layout/giphy_mp4_player.xml
index f17614ddd2..f32cc01c03 100644
--- a/app/src/main/res/layout/giphy_mp4_player.xml
+++ b/app/src/main/res/layout/giphy_mp4_player.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="0dp">
 
diff --git a/app/src/main/res/layout/google_pay_button_pref.xml b/app/src/main/res/layout/google_pay_button_pref.xml
index 893e3156d4..54ede967b0 100644
--- a/app/src/main/res/layout/google_pay_button_pref.xml
+++ b/app/src/main/res/layout/google_pay_button_pref.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/dsl_settings_gutter"
diff --git a/app/src/main/res/layout/gradient_tool_tooltip.xml b/app/src/main/res/layout/gradient_tool_tooltip.xml
index 510d3ce2ff..c9c8b0d15a 100644
--- a/app/src/main/res/layout/gradient_tool_tooltip.xml
+++ b/app/src/main/res/layout/gradient_tool_tooltip.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_call_call_full.xml b/app/src/main/res/layout/group_call_call_full.xml
index b72189026e..d6e9360262 100644
--- a/app/src/main/res/layout/group_call_call_full.xml
+++ b/app/src/main/res/layout/group_call_call_full.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    tools:viewBindingIgnore="true"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/transparent_black_40"
diff --git a/app/src/main/res/layout/group_call_participant_item.xml b/app/src/main/res/layout/group_call_participant_item.xml
index b8264a1edd..50f69075d7 100644
--- a/app/src/main/res/layout/group_call_participant_item.xml
+++ b/app/src/main/res/layout/group_call_participant_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_call_speaker_hint.xml b/app/src/main/res/layout/group_call_speaker_hint.xml
index 5bb5e6e0c8..88fa61c640 100644
--- a/app/src/main/res/layout/group_call_speaker_hint.xml
+++ b/app/src/main/res/layout/group_call_speaker_hint.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_description_dialog.xml b/app/src/main/res/layout/group_description_dialog.xml
index ef96678a57..e23180b3f6 100644
--- a/app/src/main/res/layout/group_description_dialog.xml
+++ b/app/src/main/res/layout/group_description_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="?attr/dialogPreferredPadding">
diff --git a/app/src/main/res/layout/group_invite_link_enable_and_share_bottom_sheet.xml b/app/src/main/res/layout/group_invite_link_enable_and_share_bottom_sheet.xml
index 3bc9dc9f73..d88ad3ce02 100644
--- a/app/src/main/res/layout/group_invite_link_enable_and_share_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_invite_link_enable_and_share_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_join_bottom_sheet.xml b/app/src/main/res/layout/group_join_bottom_sheet.xml
index 205b2ca08a..490986b6c4 100644
--- a/app/src/main/res/layout/group_join_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_join_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_join_update_needed_bottom_sheet.xml b/app/src/main/res/layout/group_join_update_needed_bottom_sheet.xml
index f1add6ad72..8b559f9bfa 100644
--- a/app/src/main/res/layout/group_join_update_needed_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_join_update_needed_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/group_link_share_bottom_sheet.xml b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
index 2a8c5e7480..102e10142f 100644
--- a/app/src/main/res/layout/group_link_share_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml b/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml
index e67e4d1f0c..876bc2c83d 100644
--- a/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml
+++ b/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/group_mention_setting_dialog.xml b/app/src/main/res/layout/group_mention_setting_dialog.xml
index f643541cea..76670993d3 100644
--- a/app/src/main/res/layout/group_mention_setting_dialog.xml
+++ b/app/src/main/res/layout/group_mention_setting_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml b/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
index d118376064..bef8c3c937 100644
--- a/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
+++ b/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
diff --git a/app/src/main/res/layout/group_pending_and_requesting_member_activity.xml b/app/src/main/res/layout/group_pending_and_requesting_member_activity.xml
index 8d4db68ce0..3824d8ce89 100644
--- a/app/src/main/res/layout/group_pending_and_requesting_member_activity.xml
+++ b/app/src/main/res/layout/group_pending_and_requesting_member_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/group_pending_member_invites_fragment.xml b/app/src/main/res/layout/group_pending_member_invites_fragment.xml
index ef21128d39..322018957b 100644
--- a/app/src/main/res/layout/group_pending_member_invites_fragment.xml
+++ b/app/src/main/res/layout/group_pending_member_invites_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/group_recipient_list_item.xml b/app/src/main/res/layout/group_recipient_list_item.xml
index e1b62ebcad..0cb100a759 100644
--- a/app/src/main/res/layout/group_recipient_list_item.xml
+++ b/app/src/main/res/layout/group_recipient_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/group_recipient_requesting_list_item.xml b/app/src/main/res/layout/group_recipient_requesting_list_item.xml
index 823d92802d..261323d321 100644
--- a/app/src/main/res/layout/group_recipient_requesting_list_item.xml
+++ b/app/src/main/res/layout/group_recipient_requesting_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
diff --git a/app/src/main/res/layout/group_requesting_member_fragment.xml b/app/src/main/res/layout/group_requesting_member_fragment.xml
index 550035a97d..fd86744cf2 100644
--- a/app/src/main/res/layout/group_requesting_member_fragment.xml
+++ b/app/src/main/res/layout/group_requesting_member_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml b/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
index b75355a874..feae68a366 100644
--- a/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml b/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
index d63622d345..348e01e69e 100644
--- a/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
+++ b/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml b/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
index 20cc2168b6..dc5e265b8f 100644
--- a/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index 600ac4095b..c63ba31209 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/image_editor_fragment.xml b/app/src/main/res/layout/image_editor_fragment.xml
index 7efad8fa05..2b4b46dfcc 100644
--- a/app/src/main/res/layout/image_editor_fragment.xml
+++ b/app/src/main/res/layout/image_editor_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/incognito_learn_more.xml b/app/src/main/res/layout/incognito_learn_more.xml
index d40f14b23a..7b53dde8ff 100644
--- a/app/src/main/res/layout/incognito_learn_more.xml
+++ b/app/src/main/res/layout/incognito_learn_more.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/indeterminate_loading_circle_pref.xml b/app/src/main/res/layout/indeterminate_loading_circle_pref.xml
index 219689e6f6..fd14526f52 100644
--- a/app/src/main/res/layout/indeterminate_loading_circle_pref.xml
+++ b/app/src/main/res/layout/indeterminate_loading_circle_pref.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
diff --git a/app/src/main/res/layout/inline_query_emoji_result.xml b/app/src/main/res/layout/inline_query_emoji_result.xml
index d57eddabda..70dfe5ff2b 100644
--- a/app/src/main/res/layout/inline_query_emoji_result.xml
+++ b/app/src/main/res/layout/inline_query_emoji_result.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
diff --git a/app/src/main/res/layout/inline_query_results_popup.xml b/app/src/main/res/layout/inline_query_results_popup.xml
index 27eacd4371..818391cc06 100644
--- a/app/src/main/res/layout/inline_query_results_popup.xml
+++ b/app/src/main/res/layout/inline_query_results_popup.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/insights_dashboard.xml b/app/src/main/res/layout/insights_dashboard.xml
index 3fada5e06f..515c4131c4 100644
--- a/app/src/main/res/layout/insights_dashboard.xml
+++ b/app/src/main/res/layout/insights_dashboard.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/insights_dashboard_adapter_item.xml b/app/src/main/res/layout/insights_dashboard_adapter_item.xml
index ab437edccd..95b7bc57d6 100644
--- a/app/src/main/res/layout/insights_dashboard_adapter_item.xml
+++ b/app/src/main/res/layout/insights_dashboard_adapter_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/insights_modal.xml b/app/src/main/res/layout/insights_modal.xml
index 9e7a258747..55476fb53d 100644
--- a/app/src/main/res/layout/insights_modal.xml
+++ b/app/src/main/res/layout/insights_modal.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml
index 62eddb9e17..712e11fd14 100644
--- a/app/src/main/res/layout/invite_activity.xml
+++ b/app/src/main/res/layout/invite_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_color.xml b/app/src/main/res/layout/item_color.xml
index 83507eba1c..c0f0a80038 100644
--- a/app/src/main/res/layout/item_color.xml
+++ b/app/src/main/res/layout/item_color.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_editable_contact.xml b/app/src/main/res/layout/item_editable_contact.xml
index c59bc3d977..56a9942c5d 100644
--- a/app/src/main/res/layout/item_editable_contact.xml
+++ b/app/src/main/res/layout/item_editable_contact.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/item_member_view.xml b/app/src/main/res/layout/item_member_view.xml
index fec6830665..4c53f605aa 100644
--- a/app/src/main/res/layout/item_member_view.xml
+++ b/app/src/main/res/layout/item_member_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_selectable_contact_field.xml b/app/src/main/res/layout/item_selectable_contact_field.xml
index 2374f15994..9dbce997ac 100644
--- a/app/src/main/res/layout/item_selectable_contact_field.xml
+++ b/app/src/main/res/layout/item_selectable_contact_field.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/selectable_list_item_background"
diff --git a/app/src/main/res/layout/kbs_migration_activity.xml b/app/src/main/res/layout/kbs_migration_activity.xml
index 23d0f12eee..3d62785100 100644
--- a/app/src/main/res/layout/kbs_migration_activity.xml
+++ b/app/src/main/res/layout/kbs_migration_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/kbs_pin_reminder_view.xml b/app/src/main/res/layout/kbs_pin_reminder_view.xml
index 9c9f3ae1cc..2daaea9462 100644
--- a/app/src/main/res/layout/kbs_pin_reminder_view.xml
+++ b/app/src/main/res/layout/kbs_pin_reminder_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/kbs_splash_fragment.xml b/app/src/main/res/layout/kbs_splash_fragment.xml
index cbe62726d6..4643da5014 100644
--- a/app/src/main/res/layout/kbs_splash_fragment.xml
+++ b/app/src/main/res/layout/kbs_splash_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/keyboard_entry_fragment.xml b/app/src/main/res/layout/keyboard_entry_fragment.xml
index f96b108ac9..71cde60a5a 100644
--- a/app/src/main/res/layout/keyboard_entry_fragment.xml
+++ b/app/src/main/res/layout/keyboard_entry_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/keyboard_pager_category_icon.xml b/app/src/main/res/layout/keyboard_pager_category_icon.xml
index 5bb892dff0..1ae3d80086 100644
--- a/app/src/main/res/layout/keyboard_pager_category_icon.xml
+++ b/app/src/main/res/layout/keyboard_pager_category_icon.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/keyboard_pager_emoji_page_fragment.xml b/app/src/main/res/layout/keyboard_pager_emoji_page_fragment.xml
index d48e7513a3..6b957f3e02 100644
--- a/app/src/main/res/layout/keyboard_pager_emoji_page_fragment.xml
+++ b/app/src/main/res/layout/keyboard_pager_emoji_page_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/keyboard_pager_fragment.xml b/app/src/main/res/layout/keyboard_pager_fragment.xml
index f1c20e99be..e4c3bba42e 100644
--- a/app/src/main/res/layout/keyboard_pager_fragment.xml
+++ b/app/src/main/res/layout/keyboard_pager_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/keyboard_pager_search_bar.xml b/app/src/main/res/layout/keyboard_pager_search_bar.xml
index 146752ab04..b950bedf2d 100644
--- a/app/src/main/res/layout/keyboard_pager_search_bar.xml
+++ b/app/src/main/res/layout/keyboard_pager_search_bar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/keyboard_pager_sticker_page_fragment.xml b/app/src/main/res/layout/keyboard_pager_sticker_page_fragment.xml
index e2dd641939..ac7ee174cb 100644
--- a/app/src/main/res/layout/keyboard_pager_sticker_page_fragment.xml
+++ b/app/src/main/res/layout/keyboard_pager_sticker_page_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/labeled_edit_text.xml b/app/src/main/res/layout/labeled_edit_text.xml
index d41a32ffd1..ad392ed04f 100644
--- a/app/src/main/res/layout/labeled_edit_text.xml
+++ b/app/src/main/res/layout/labeled_edit_text.xml
@@ -2,6 +2,7 @@
 
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/labeled_edit_text_default.xml b/app/src/main/res/layout/labeled_edit_text_default.xml
index 435f2459dc..65157334fd 100644
--- a/app/src/main/res/layout/labeled_edit_text_default.xml
+++ b/app/src/main/res/layout/labeled_edit_text_default.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.EmojiEditText
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/input"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/large_icon_preference_item.xml b/app/src/main/res/layout/large_icon_preference_item.xml
index 99b5795180..9690102ed7 100644
--- a/app/src/main/res/layout/large_icon_preference_item.xml
+++ b/app/src/main/res/layout/large_icon_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/led_color_preference_widget.xml b/app/src/main/res/layout/led_color_preference_widget.xml
index a310159d71..2ae6921699 100644
--- a/app/src/main/res/layout/led_color_preference_widget.xml
+++ b/app/src/main/res/layout/led_color_preference_widget.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:layout_marginEnd="3dp">
diff --git a/app/src/main/res/layout/link_preview.xml b/app/src/main/res/layout/link_preview.xml
index 993f90e22b..b82d90d3e7 100644
--- a/app/src/main/res/layout/link_preview.xml
+++ b/app/src/main/res/layout/link_preview.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/load_more_header.xml b/app/src/main/res/layout/load_more_header.xml
index 2fd0ef17a1..816fbac82b 100644
--- a/app/src/main/res/layout/load_more_header.xml
+++ b/app/src/main/res/layout/load_more_header.xml
@@ -2,6 +2,7 @@
 
 <ViewSwitcher
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:wheel="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/longmessage_bubble_received.xml b/app/src/main/res/layout/longmessage_bubble_received.xml
index 6ad53cfa24..1147f3836c 100644
--- a/app/src/main/res/layout/longmessage_bubble_received.xml
+++ b/app/src/main/res/layout/longmessage_bubble_received.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/longmessage_bubble_sent.xml b/app/src/main/res/layout/longmessage_bubble_sent.xml
index 02204b3b3d..49a7656876 100644
--- a/app/src/main/res/layout/longmessage_bubble_sent.xml
+++ b/app/src/main/res/layout/longmessage_bubble_sent.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/longmessage_fragment.xml b/app/src/main/res/layout/longmessage_fragment.xml
index 623af3d86e..d130d472ec 100644
--- a/app/src/main/res/layout/longmessage_fragment.xml
+++ b/app/src/main/res/layout/longmessage_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 7ee974c14a..b2fabcca41 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/main_activity_list_host_fragment.xml b/app/src/main/res/layout/main_activity_list_host_fragment.xml
index 5ed1ef9b36..bd257380aa 100644
--- a/app/src/main/res/layout/main_activity_list_host_fragment.xml
+++ b/app/src/main/res/layout/main_activity_list_host_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/manage_profile_activity.xml b/app/src/main/res/layout/manage_profile_activity.xml
index 5b63988351..42ba46d32c 100644
--- a/app/src/main/res/layout/manage_profile_activity.xml
+++ b/app/src/main/res/layout/manage_profile_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/manage_profile_fragment.xml b/app/src/main/res/layout/manage_profile_fragment.xml
index 79e681bca2..ef1eed9d86 100644
--- a/app/src/main/res/layout/manage_profile_fragment.xml
+++ b/app/src/main/res/layout/manage_profile_fragment.xml
@@ -2,6 +2,7 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/material3_serarch_toolbar.xml b/app/src/main/res/layout/material3_serarch_toolbar.xml
index 9ac9bdc080..3fe73bb1c0 100644
--- a/app/src/main/res/layout/material3_serarch_toolbar.xml
+++ b/app/src/main/res/layout/material3_serarch_toolbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/signal_m3_toolbar_height"
diff --git a/app/src/main/res/layout/media_keyboard.xml b/app/src/main/res/layout/media_keyboard.xml
index 5e6dd840f9..c9bd6ec63f 100644
--- a/app/src/main/res/layout/media_keyboard.xml
+++ b/app/src/main/res/layout/media_keyboard.xml
@@ -2,6 +2,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     tools:parentTag="org.thoughtcrime.securesms.components.emoji.MediaKeyboard">
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/media_overview_activity.xml b/app/src/main/res/layout/media_overview_activity.xml
index 212d922a88..e3eccc38d4 100644
--- a/app/src/main/res/layout/media_overview_activity.xml
+++ b/app/src/main/res/layout/media_overview_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/media_overview_detail_item_audio.xml b/app/src/main/res/layout/media_overview_detail_item_audio.xml
index 8f537a2e4f..8d7142804c 100644
--- a/app/src/main/res/layout/media_overview_detail_item_audio.xml
+++ b/app/src/main/res/layout/media_overview_detail_item_audio.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/media_overview_detail_item_document.xml b/app/src/main/res/layout/media_overview_detail_item_document.xml
index 8bd5eafe27..81d76658d1 100644
--- a/app/src/main/res/layout/media_overview_detail_item_document.xml
+++ b/app/src/main/res/layout/media_overview_detail_item_document.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/media_overview_detail_item_media.xml b/app/src/main/res/layout/media_overview_detail_item_media.xml
index 9f6fceea3a..ba644a15c7 100644
--- a/app/src/main/res/layout/media_overview_detail_item_media.xml
+++ b/app/src/main/res/layout/media_overview_detail_item_media.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/media_overview_detail_text.xml b/app/src/main/res/layout/media_overview_detail_text.xml
index 0cee95a80f..f35adca5ab 100644
--- a/app/src/main/res/layout/media_overview_detail_text.xml
+++ b/app/src/main/res/layout/media_overview_detail_text.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/media_overview_text"
     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/media_overview_gallery_item.xml b/app/src/main/res/layout/media_overview_gallery_item.xml
index 6b137c0c0c..fa687294af 100644
--- a/app/src/main/res/layout/media_overview_gallery_item.xml
+++ b/app/src/main/res/layout/media_overview_gallery_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/media_overview_item_header.xml b/app/src/main/res/layout/media_overview_item_header.xml
index a39c38573f..242c20af98 100644
--- a/app/src/main/res/layout/media_overview_item_header.xml
+++ b/app/src/main/res/layout/media_overview_item_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/signal_background_primary"
diff --git a/app/src/main/res/layout/media_overview_page_fragment.xml b/app/src/main/res/layout/media_overview_page_fragment.xml
index 4b826d865e..783232842b 100644
--- a/app/src/main/res/layout/media_overview_page_fragment.xml
+++ b/app/src/main/res/layout/media_overview_page_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/media_overview_selected_overlay.xml b/app/src/main/res/layout/media_overview_selected_overlay.xml
index 3b45243803..e2728cb62e 100644
--- a/app/src/main/res/layout/media_overview_selected_overlay.xml
+++ b/app/src/main/res/layout/media_overview_selected_overlay.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/selected_indicator"
     android:layout_width="56dp"
diff --git a/app/src/main/res/layout/media_preview_activity.xml b/app/src/main/res/layout/media_preview_activity.xml
index 895cc8ad6b..80b8767a2d 100644
--- a/app/src/main/res/layout/media_preview_activity.xml
+++ b/app/src/main/res/layout/media_preview_activity.xml
@@ -2,6 +2,7 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/media_preview_exoplayer_layout.xml b/app/src/main/res/layout/media_preview_exoplayer_layout.xml
index d6b870c7c5..78fede4eda 100644
--- a/app/src/main/res/layout/media_preview_exoplayer_layout.xml
+++ b/app/src/main/res/layout/media_preview_exoplayer_layout.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/media_preview_image_fragment.xml b/app/src/main/res/layout/media_preview_image_fragment.xml
index 8ebf575390..99aa3d21da 100644
--- a/app/src/main/res/layout/media_preview_image_fragment.xml
+++ b/app/src/main/res/layout/media_preview_image_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.ZoomingImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="false"
diff --git a/app/src/main/res/layout/media_preview_video_fragment.xml b/app/src/main/res/layout/media_preview_video_fragment.xml
index 5224e6a71f..6e8796adb1 100644
--- a/app/src/main/res/layout/media_preview_video_fragment.xml
+++ b/app/src/main/res/layout/media_preview_video_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/media_selection_activity.xml b/app/src/main/res/layout/media_selection_activity.xml
index 20e7843499..d3d0e1987d 100644
--- a/app/src/main/res/layout/media_selection_activity.xml
+++ b/app/src/main/res/layout/media_selection_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/media_selection_activity_text_selected_constraints.xml b/app/src/main/res/layout/media_selection_activity_text_selected_constraints.xml
index 1e31cd5ed8..9dfaf7eb84 100644
--- a/app/src/main/res/layout/media_selection_activity_text_selected_constraints.xml
+++ b/app/src/main/res/layout/media_selection_activity_text_selected_constraints.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/switch_widget"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/media_view_edit_button.xml b/app/src/main/res/layout/media_view_edit_button.xml
index a850254421..52ebf669c0 100644
--- a/app/src/main/res/layout/media_view_edit_button.xml
+++ b/app/src/main/res/layout/media_view_edit_button.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
            android:id="@+id/edit_image_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/media_view_remove_button.xml b/app/src/main/res/layout/media_view_remove_button.xml
index 44bf070aaa..f4b92f4e93 100644
--- a/app/src/main/res/layout/media_view_remove_button.xml
+++ b/app/src/main/res/layout/media_view_remove_button.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
            android:id="@+id/remove_image_button"
            android:layout_width="@dimen/media_bubble_remove_button_size"
            android:layout_height="@dimen/media_bubble_remove_button_size"
diff --git a/app/src/main/res/layout/mediarail_button_item.xml b/app/src/main/res/layout/mediarail_button_item.xml
index 1cdf3e6ff7..8e17e43699 100644
--- a/app/src/main/res/layout/mediarail_button_item.xml
+++ b/app/src/main/res/layout/mediarail_button_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="56dp"
     android:layout_height="56dp"
diff --git a/app/src/main/res/layout/mediarail_media_item.xml b/app/src/main/res/layout/mediarail_media_item.xml
index 58fc47ad25..2ee28a3628 100644
--- a/app/src/main/res/layout/mediarail_media_item.xml
+++ b/app/src/main/res/layout/mediarail_media_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="57dp"
diff --git a/app/src/main/res/layout/mediasend_image_fragment.xml b/app/src/main/res/layout/mediasend_image_fragment.xml
index 772908fba2..c7be953f5a 100644
--- a/app/src/main/res/layout/mediasend_image_fragment.xml
+++ b/app/src/main/res/layout/mediasend_image_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/mediasend_video_fragment.xml b/app/src/main/res/layout/mediasend_video_fragment.xml
index 6a0962f1fd..f72eb6bdc4 100644
--- a/app/src/main/res/layout/mediasend_video_fragment.xml
+++ b/app/src/main/res/layout/mediasend_video_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/mentions_picker_fragment.xml b/app/src/main/res/layout/mentions_picker_fragment.xml
index a7a2b1a19f..f72a098655 100644
--- a/app/src/main/res/layout/mentions_picker_fragment.xml
+++ b/app/src/main/res/layout/mentions_picker_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/mentions_picker_recipient_list_item.xml b/app/src/main/res/layout/mentions_picker_recipient_list_item.xml
index caaae18088..f6101a162d 100644
--- a/app/src/main/res/layout/mentions_picker_recipient_list_item.xml
+++ b/app/src/main/res/layout/mentions_picker_recipient_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/message_details_fragment.xml b/app/src/main/res/layout/message_details_fragment.xml
index 39b62fe81c..f008ab2ec7 100644
--- a/app/src/main/res/layout/message_details_fragment.xml
+++ b/app/src/main/res/layout/message_details_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/message_details_header.xml b/app/src/main/res/layout/message_details_header.xml
index d60c5fc6d7..3918453ba1 100644
--- a/app/src/main/res/layout/message_details_header.xml
+++ b/app/src/main/res/layout/message_details_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/group_media_card"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/message_details_recipient.xml b/app/src/main/res/layout/message_details_recipient.xml
index 1f162a85d5..d44fcfbda5 100644
--- a/app/src/main/res/layout/message_details_recipient.xml
+++ b/app/src/main/res/layout/message_details_recipient.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/group_media_card"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/message_details_recipient_header.xml b/app/src/main/res/layout/message_details_recipient_header.xml
index 34d9b4c25f..9c0234af01 100644
--- a/app/src/main/res/layout/message_details_recipient_header.xml
+++ b/app/src/main/res/layout/message_details_recipient_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/group_media_card"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/message_quote_header_decoration.xml b/app/src/main/res/layout/message_quote_header_decoration.xml
index 5774f31c40..f9d72084a6 100644
--- a/app/src/main/res/layout/message_quote_header_decoration.xml
+++ b/app/src/main/res/layout/message_quote_header_decoration.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/message_quotes_bottom_sheet.xml b/app/src/main/res/layout/message_quotes_bottom_sheet.xml
index 1f198b4a88..d9deb7dc34 100644
--- a/app/src/main/res/layout/message_quotes_bottom_sheet.xml
+++ b/app/src/main/res/layout/message_quotes_bottom_sheet.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/message_request_bottom_bar.xml b/app/src/main/res/layout/message_request_bottom_bar.xml
index 8975589e89..1b0721eeb0 100644
--- a/app/src/main/res/layout/message_request_bottom_bar.xml
+++ b/app/src/main/res/layout/message_request_bottom_bar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/app/src/main/res/layout/message_requests_megaphone_activity.xml b/app/src/main/res/layout/message_requests_megaphone_activity.xml
index 03f27d0fd4..70759f3063 100644
--- a/app/src/main/res/layout/message_requests_megaphone_activity.xml
+++ b/app/src/main/res/layout/message_requests_megaphone_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/microphone_recorder_view.xml b/app/src/main/res/layout/microphone_recorder_view.xml
index ac3f025c29..0e86121643 100644
--- a/app/src/main/res/layout/microphone_recorder_view.xml
+++ b/app/src/main/res/layout/microphone_recorder_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="@layout/conversation_input_panel">
 
diff --git a/app/src/main/res/layout/mnemonic_part_adapter_item.xml b/app/src/main/res/layout/mnemonic_part_adapter_item.xml
index 088b623856..b39289eb81 100644
--- a/app/src/main/res/layout/mnemonic_part_adapter_item.xml
+++ b/app/src/main/res/layout/mnemonic_part_adapter_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="12dp"
diff --git a/app/src/main/res/layout/multiselect_bottom_sheet.xml b/app/src/main/res/layout/multiselect_bottom_sheet.xml
index b77fea149f..2edb94ef83 100644
--- a/app/src/main/res/layout/multiselect_bottom_sheet.xml
+++ b/app/src/main/res/layout/multiselect_bottom_sheet.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/multiselect_forward_activity.xml b/app/src/main/res/layout/multiselect_forward_activity.xml
index ce3a1f152b..f89856401e 100644
--- a/app/src/main/res/layout/multiselect_forward_activity.xml
+++ b/app/src/main/res/layout/multiselect_forward_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/multiselect_forward_fragment.xml b/app/src/main/res/layout/multiselect_forward_fragment.xml
index 5285d1d43d..171095faad 100644
--- a/app/src/main/res/layout/multiselect_forward_fragment.xml
+++ b/app/src/main/res/layout/multiselect_forward_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
index 916e6d2bf4..0a93f0d4ef 100644
--- a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
+++ b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_bar"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar_and_spacer.xml b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar_and_spacer.xml
index e7248250c2..2026955038 100644
--- a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar_and_spacer.xml
+++ b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar_and_spacer.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/my_support_preference.xml b/app/src/main/res/layout/my_support_preference.xml
index b27455e046..f024f24836 100644
--- a/app/src/main/res/layout/my_support_preference.xml
+++ b/app/src/main/res/layout/my_support_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/network_failure_pref.xml b/app/src/main/res/layout/network_failure_pref.xml
index 8d8ad98549..c0a7cb944b 100644
--- a/app/src/main/res/layout/network_failure_pref.xml
+++ b/app/src/main/res/layout/network_failure_pref.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/new_device_transfer_complete_fragment.xml b/app/src/main/res/layout/new_device_transfer_complete_fragment.xml
index 222a8c171b..6a358effbf 100644
--- a/app/src/main/res/layout/new_device_transfer_complete_fragment.xml
+++ b/app/src/main/res/layout/new_device_transfer_complete_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/new_device_transfer_instructions_fragment.xml b/app/src/main/res/layout/new_device_transfer_instructions_fragment.xml
index d1b1e79c0b..c98137bfc8 100644
--- a/app/src/main/res/layout/new_device_transfer_instructions_fragment.xml
+++ b/app/src/main/res/layout/new_device_transfer_instructions_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/new_notification_profile_pref.xml b/app/src/main/res/layout/new_notification_profile_pref.xml
index 1913b041eb..6813693c0f 100644
--- a/app/src/main/res/layout/new_notification_profile_pref.xml
+++ b/app/src/main/res/layout/new_notification_profile_pref.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Signal.Widget.Button.Large.Secondary"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/notification_profile_entry_pref.xml b/app/src/main/res/layout/notification_profile_entry_pref.xml
index e4e92f83e7..82c9b0821d 100644
--- a/app/src/main/res/layout/notification_profile_entry_pref.xml
+++ b/app/src/main/res/layout/notification_profile_entry_pref.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/notification_profile_preference_item.xml b/app/src/main/res/layout/notification_profile_preference_item.xml
index 0ac9a7dcca..a33ca18fb0 100644
--- a/app/src/main/res/layout/notification_profile_preference_item.xml
+++ b/app/src/main/res/layout/notification_profile_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/notification_profile_recipient_list_item.xml b/app/src/main/res/layout/notification_profile_recipient_list_item.xml
index 98b0fb29df..816166a181 100644
--- a/app/src/main/res/layout/notification_profile_recipient_list_item.xml
+++ b/app/src/main/res/layout/notification_profile_recipient_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/notification_profiles_empty.xml b/app/src/main/res/layout/notification_profiles_empty.xml
index 3fcc2ae461..d1d3ac0ab3 100644
--- a/app/src/main/res/layout/notification_profiles_empty.xml
+++ b/app/src/main/res/layout/notification_profiles_empty.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/null_recyclerview_header.xml b/app/src/main/res/layout/null_recyclerview_header.xml
index 5e23938d73..f8c03e6b95 100644
--- a/app/src/main/res/layout/null_recyclerview_header.xml
+++ b/app/src/main/res/layout/null_recyclerview_header.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="@dimen/selection_item_header_width"
     android:layout_height="@dimen/selection_item_header_height"
     android:gravity="center" />
diff --git a/app/src/main/res/layout/numeric_keyboard_view.xml b/app/src/main/res/layout/numeric_keyboard_view.xml
index c3588e51a6..17db341e19 100644
--- a/app/src/main/res/layout/numeric_keyboard_view.xml
+++ b/app/src/main/res/layout/numeric_keyboard_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/old_device_transfer_activity.xml b/app/src/main/res/layout/old_device_transfer_activity.xml
index 8270ef9ec9..cea890a163 100644
--- a/app/src/main/res/layout/old_device_transfer_activity.xml
+++ b/app/src/main/res/layout/old_device_transfer_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/old_device_transfer_complete_fragment.xml b/app/src/main/res/layout/old_device_transfer_complete_fragment.xml
index cedfcaffa9..fc0921f713 100644
--- a/app/src/main/res/layout/old_device_transfer_complete_fragment.xml
+++ b/app/src/main/res/layout/old_device_transfer_complete_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml b/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml
index 7f84309de2..ce278e1f2b 100644
--- a/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml
+++ b/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml b/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
index c585da84ca..4225e7acda 100644
--- a/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
+++ b/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/on_reaction_sent_view.xml b/app/src/main/res/layout/on_reaction_sent_view.xml
index 4bad575377..e635bcdf70 100644
--- a/app/src/main/res/layout/on_reaction_sent_view.xml
+++ b/app/src/main/res/layout/on_reaction_sent_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/motion_layout"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/onboarding_megaphone.xml b/app/src/main/res/layout/onboarding_megaphone.xml
index 94dc90e64b..20a1793205 100644
--- a/app/src/main/res/layout/onboarding_megaphone.xml
+++ b/app/src/main/res/layout/onboarding_megaphone.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/onboarding_megaphone_list_item.xml b/app/src/main/res/layout/onboarding_megaphone_list_item.xml
index 2297c7f98b..969b238bed 100644
--- a/app/src/main/res/layout/onboarding_megaphone_list_item.xml
+++ b/app/src/main/res/layout/onboarding_megaphone_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="180dp"
diff --git a/app/src/main/res/layout/outlined_switch.xml b/app/src/main/res/layout/outlined_switch.xml
index 8728c3f6ef..a5d8ff65eb 100644
--- a/app/src/main/res/layout/outlined_switch.xml
+++ b/app/src/main/res/layout/outlined_switch.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/payment_details_fragment.xml b/app/src/main/res/layout/payment_details_fragment.xml
index 47f6e14d6f..5472f43a67 100644
--- a/app/src/main/res/layout/payment_details_fragment.xml
+++ b/app/src/main/res/layout/payment_details_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/payment_info_card.xml b/app/src/main/res/layout/payment_info_card.xml
index b49c40ba5a..611dba5687 100644
--- a/app/src/main/res/layout/payment_info_card.xml
+++ b/app/src/main/res/layout/payment_info_card.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/payment_notification_view.xml b/app/src/main/res/layout/payment_notification_view.xml
index ba3165dd5c..bff4bc5f75 100644
--- a/app/src/main/res/layout/payment_notification_view.xml
+++ b/app/src/main/res/layout/payment_notification_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.UnreadPaymentsView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/payment_pill_strip.xml b/app/src/main/res/layout/payment_pill_strip.xml
index 2944e237d9..099fd7ebd3 100644
--- a/app/src/main/res/layout/payment_pill_strip.xml
+++ b/app/src/main/res/layout/payment_pill_strip.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="org.thoughtcrime.securesms.components.PaymentPillStrip">
 
diff --git a/app/src/main/res/layout/payment_preferences_all_pager_item_fragment.xml b/app/src/main/res/layout/payment_preferences_all_pager_item_fragment.xml
index 4f060a855c..a49c93a64d 100644
--- a/app/src/main/res/layout/payment_preferences_all_pager_item_fragment.xml
+++ b/app/src/main/res/layout/payment_preferences_all_pager_item_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/payments_activity_pager_item_fragment_recycler"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payment_recipient_selection_fragment.xml b/app/src/main/res/layout/payment_recipient_selection_fragment.xml
index 7efe1214b9..b16f49b617 100644
--- a/app/src/main/res/layout/payment_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/payment_recipient_selection_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/payments_activity.xml b/app/src/main/res/layout/payments_activity.xml
index 40be42bd89..f27c3b939c 100644
--- a/app/src/main/res/layout/payments_activity.xml
+++ b/app/src/main/res/layout/payments_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/payments_activity_fragment.xml b/app/src/main/res/layout/payments_activity_fragment.xml
index fc792c3177..8e7fdce8a1 100644
--- a/app/src/main/res/layout/payments_activity_fragment.xml
+++ b/app/src/main/res/layout/payments_activity_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/payments_add_money_fragment.xml b/app/src/main/res/layout/payments_add_money_fragment.xml
index be33706e93..720c637b51 100644
--- a/app/src/main/res/layout/payments_add_money_fragment.xml
+++ b/app/src/main/res/layout/payments_add_money_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:fillViewport="true"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payments_home_fragment.xml b/app/src/main/res/layout/payments_home_fragment.xml
index 7390defe27..2e396e4c3f 100644
--- a/app/src/main/res/layout/payments_home_fragment.xml
+++ b/app/src/main/res/layout/payments_home_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/payments_home_fragment_header.xml b/app/src/main/res/layout/payments_home_fragment_header.xml
index 15a05f4352..80dcc60de8 100644
--- a/app/src/main/res/layout/payments_home_fragment_header.xml
+++ b/app/src/main/res/layout/payments_home_fragment_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/payments_home_fragment_header"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payments_home_in_progress.xml b/app/src/main/res/layout/payments_home_in_progress.xml
index fd61e9bd38..a81784c643 100644
--- a/app/src/main/res/layout/payments_home_in_progress.xml
+++ b/app/src/main/res/layout/payments_home_in_progress.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="160dp">
 
diff --git a/app/src/main/res/layout/payments_home_introducing_payments_item.xml b/app/src/main/res/layout/payments_home_introducing_payments_item.xml
index b7bb010b8b..defe660be7 100644
--- a/app/src/main/res/layout/payments_home_introducing_payments_item.xml
+++ b/app/src/main/res/layout/payments_home_introducing_payments_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/payments_home_no_recent_activity_item.xml b/app/src/main/res/layout/payments_home_no_recent_activity_item.xml
index ead72ff7f9..a817aa8447 100644
--- a/app/src/main/res/layout/payments_home_no_recent_activity_item.xml
+++ b/app/src/main/res/layout/payments_home_no_recent_activity_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="160dp"
     android:gravity="center"
diff --git a/app/src/main/res/layout/payments_home_payment_item.xml b/app/src/main/res/layout/payments_home_payment_item.xml
index 9a6a1b6c1d..de5a9a1ba5 100644
--- a/app/src/main/res/layout/payments_home_payment_item.xml
+++ b/app/src/main/res/layout/payments_home_payment_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/payments_home_see_all_item.xml b/app/src/main/res/layout/payments_home_see_all_item.xml
index af737225e6..32ff24de62 100644
--- a/app/src/main/res/layout/payments_home_see_all_item.xml
+++ b/app/src/main/res/layout/payments_home_see_all_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/payments_home_see_all_item_button"
     android:layout_width="match_parent"
     android:layout_height="56dp"
diff --git a/app/src/main/res/layout/payments_preference.xml b/app/src/main/res/layout/payments_preference.xml
index da0edc5874..be68093579 100644
--- a/app/src/main/res/layout/payments_preference.xml
+++ b/app/src/main/res/layout/payments_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?listPreferredItemHeight">
diff --git a/app/src/main/res/layout/payments_recovery_entry_fragment.xml b/app/src/main/res/layout/payments_recovery_entry_fragment.xml
index dc4d157a22..5fed706cb2 100644
--- a/app/src/main/res/layout/payments_recovery_entry_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_entry_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/payments_recovery_paste_fragment.xml b/app/src/main/res/layout/payments_recovery_paste_fragment.xml
index 90e615697a..b12e3a1b5c 100644
--- a/app/src/main/res/layout/payments_recovery_paste_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_paste_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml b/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
index ed76c7193b..fb06915de6 100644
--- a/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/payments_recovery_phrase_fragment.xml b/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
index 517cba136c..9a70f84c85 100644
--- a/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/payments_recovery_start_fragment.xml b/app/src/main/res/layout/payments_recovery_start_fragment.xml
index c5472700f8..0d9ea243f2 100644
--- a/app/src/main/res/layout/payments_recovery_start_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_start_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/payments_terms_of_service_fragment.xml b/app/src/main/res/layout/payments_terms_of_service_fragment.xml
index 167c91904c..9602245e84 100644
--- a/app/src/main/res/layout/payments_terms_of_service_fragment.xml
+++ b/app/src/main/res/layout/payments_terms_of_service_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/payments_transfer_fragment.xml b/app/src/main/res/layout/payments_transfer_fragment.xml
index ce49bf7552..b3fa5d52e1 100644
--- a/app/src/main/res/layout/payments_transfer_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml b/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
index 897782993a..f0970c11cb 100644
--- a/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/permissions_rationale_dialog.xml b/app/src/main/res/layout/permissions_rationale_dialog.xml
index d79eef1551..9f3498160c 100644
--- a/app/src/main/res/layout/permissions_rationale_dialog.xml
+++ b/app/src/main/res/layout/permissions_rationale_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="vertical"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/phone_text.xml b/app/src/main/res/layout/phone_text.xml
index 3655f7bcbf..a757b5ffbf 100644
--- a/app/src/main/res/layout/phone_text.xml
+++ b/app/src/main/res/layout/phone_text.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <EditText
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/input"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/pin_disable_reminders_dialog.xml b/app/src/main/res/layout/pin_disable_reminders_dialog.xml
index f10b23c61b..9b583a90e5 100644
--- a/app/src/main/res/layout/pin_disable_reminders_dialog.xml
+++ b/app/src/main/res/layout/pin_disable_reminders_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/pin_restore_activity.xml b/app/src/main/res/layout/pin_restore_activity.xml
index ee75bfdb0f..192ab7fb9a 100644
--- a/app/src/main/res/layout/pin_restore_activity.xml
+++ b/app/src/main/res/layout/pin_restore_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/pin_restore_entry_fragment.xml b/app/src/main/res/layout/pin_restore_entry_fragment.xml
index 862cd5b0f1..15ca6d7b2a 100644
--- a/app/src/main/res/layout/pin_restore_entry_fragment.xml
+++ b/app/src/main/res/layout/pin_restore_entry_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/pin_restore_locked_fragment.xml b/app/src/main/res/layout/pin_restore_locked_fragment.xml
index 66fe891ff0..14fc0ce04a 100644
--- a/app/src/main/res/layout/pin_restore_locked_fragment.xml
+++ b/app/src/main/res/layout/pin_restore_locked_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/popup_megaphone_view.xml b/app/src/main/res/layout/popup_megaphone_view.xml
index be6ead7b04..13c9a376dc 100644
--- a/app/src/main/res/layout/popup_megaphone_view.xml
+++ b/app/src/main/res/layout/popup_megaphone_view.xml
@@ -2,6 +2,7 @@
 
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/app/src/main/res/layout/preference_danger.xml b/app/src/main/res/layout/preference_danger.xml
index 87348f85a7..ea14f18da0 100644
--- a/app/src/main/res/layout/preference_danger.xml
+++ b/app/src/main/res/layout/preference_danger.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/preference_data_and_storage_call_bandwidth_notice.xml b/app/src/main/res/layout/preference_data_and_storage_call_bandwidth_notice.xml
index e995919918..427a3c5c12 100644
--- a/app/src/main/res/layout/preference_data_and_storage_call_bandwidth_notice.xml
+++ b/app/src/main/res/layout/preference_data_and_storage_call_bandwidth_notice.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_marginStart="16dp"
     android:layout_marginEnd="16dp"
     android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/preference_divider.xml b/app/src/main/res/layout/preference_divider.xml
index 57ca2be332..844269f53c 100644
--- a/app/src/main/res/layout/preference_divider.xml
+++ b/app/src/main/res/layout/preference_divider.xml
@@ -1,4 +1,6 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="10dp"
     android:background="@drawable/preference_divider" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_right_summary_widget.xml b/app/src/main/res/layout/preference_right_summary_widget.xml
index e8f175d5e3..82d0fa1a89 100644
--- a/app/src/main/res/layout/preference_right_summary_widget.xml
+++ b/app/src/main/res/layout/preference_right_summary_widget.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/preference_storage_category.xml b/app/src/main/res/layout/preference_storage_category.xml
index d732f9c614..e267183cff 100644
--- a/app/src/main/res/layout/preference_storage_category.xml
+++ b/app/src/main/res/layout/preference_storage_category.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/preference_username.xml b/app/src/main/res/layout/preference_username.xml
index a8d696db61..614a6b8eb2 100644
--- a/app/src/main/res/layout/preference_username.xml
+++ b/app/src/main/res/layout/preference_username.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/selectableItemBackground"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/preference_widget_color_swatch.xml b/app/src/main/res/layout/preference_widget_color_swatch.xml
index 0ac82c7fe2..14f710f681 100644
--- a/app/src/main/res/layout/preference_widget_color_swatch.xml
+++ b/app/src/main/res/layout/preference_widget_color_swatch.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
            android:id="@+id/color_picker_widget"
            android:layout_width="24dp"
            android:layout_height="24dp"
diff --git a/app/src/main/res/layout/preference_widget_progress.xml b/app/src/main/res/layout/preference_widget_progress.xml
index 3cce4b9483..fcb343d41d 100644
--- a/app/src/main/res/layout/preference_widget_progress.xml
+++ b/app/src/main/res/layout/preference_widget_progress.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:id="@+id/container"
               android:orientation="vertical"
               android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/processing_payment_dialog.xml b/app/src/main/res/layout/processing_payment_dialog.xml
index 609483bddd..b358c306c0 100644
--- a/app/src/main/res/layout/processing_payment_dialog.xml
+++ b/app/src/main/res/layout/processing_payment_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/profile_create_activity.xml b/app/src/main/res/layout/profile_create_activity.xml
index d56c74e977..c4060663d9 100644
--- a/app/src/main/res/layout/profile_create_activity.xml
+++ b/app/src/main/res/layout/profile_create_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/profile_create_fragment.xml b/app/src/main/res/layout/profile_create_fragment.xml
index 82518c392f..18aa3b0ab5 100644
--- a/app/src/main/res/layout/profile_create_fragment.xml
+++ b/app/src/main/res/layout/profile_create_fragment.xml
@@ -2,6 +2,7 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/profile_preference_view.xml b/app/src/main/res/layout/profile_preference_view.xml
index b4c5bde5d2..20b4aea13b 100644
--- a/app/src/main/res/layout/profile_preference_view.xml
+++ b/app/src/main/res/layout/profile_preference_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="horizontal"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/progress_dialog.xml b/app/src/main/res/layout/progress_dialog.xml
index 993305c094..68f9a7a5fe 100644
--- a/app/src/main/res/layout/progress_dialog.xml
+++ b/app/src/main/res/layout/progress_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/prompt_apn_activity.xml b/app/src/main/res/layout/prompt_apn_activity.xml
index 63cd653eaf..0f40f72053 100644
--- a/app/src/main/res/layout/prompt_apn_activity.xml
+++ b/app/src/main/res/layout/prompt_apn_activity.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:fillViewport="true"
diff --git a/app/src/main/res/layout/prompt_passphrase_activity.xml b/app/src/main/res/layout/prompt_passphrase_activity.xml
index 8a251b4239..dc51304135 100644
--- a/app/src/main/res/layout/prompt_passphrase_activity.xml
+++ b/app/src/main/res/layout/prompt_passphrase_activity.xml
@@ -2,6 +2,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/proxy_bottom_sheet.xml b/app/src/main/res/layout/proxy_bottom_sheet.xml
index f7553838aa..deabf0f789 100644
--- a/app/src/main/res/layout/proxy_bottom_sheet.xml
+++ b/app/src/main/res/layout/proxy_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/quality_selector_dialog.xml b/app/src/main/res/layout/quality_selector_dialog.xml
index cc70d110ab..90f3213aff 100644
--- a/app/src/main/res/layout/quality_selector_dialog.xml
+++ b/app/src/main/res/layout/quality_selector_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml
index bf07d93350..65ac00166e 100644
--- a/app/src/main/res/layout/quote_view.xml
+++ b/app/src/main/res/layout/quote_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/quote_container"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/react_with_any_emoji_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/react_with_any_emoji_bottom_sheet_dialog_fragment.xml
index 2369e00b58..d43adc8549 100644
--- a/app/src/main/res/layout/react_with_any_emoji_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/react_with_any_emoji_bottom_sheet_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/react_with_any_emoji_layout"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/react_with_any_emoji_tabs.xml b/app/src/main/res/layout/react_with_any_emoji_tabs.xml
index 3b34a95f57..72e6322435 100644
--- a/app/src/main/res/layout/react_with_any_emoji_tabs.xml
+++ b/app/src/main/res/layout/react_with_any_emoji_tabs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tab_bar"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml
index 6a89fc3dbb..90537a7345 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/reactions_bottom_view_parent"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
index 11a53c34b3..3fe4af0f84 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
index f1d0c195c9..3345640252 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="52dp">
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml
index 91d4c6c861..8185ba56a7 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/reactions_bottom_view_recipient_recycler"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/reactions_pill.xml b/app/src/main/res/layout/reactions_pill.xml
index a5bd0d6197..a547eb5061 100644
--- a/app/src/main/res/layout/reactions_pill.xml
+++ b/app/src/main/res/layout/reactions_pill.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/recaptcha_activity.xml b/app/src/main/res/layout/recaptcha_activity.xml
index 64a860c6ed..b6ab3122eb 100644
--- a/app/src/main/res/layout/recaptcha_activity.xml
+++ b/app/src/main/res/layout/recaptcha_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/recaptcha_required_bottom_sheet.xml b/app/src/main/res/layout/recaptcha_required_bottom_sheet.xml
index f9072fe3f4..45b8b94e04 100644
--- a/app/src/main/res/layout/recaptcha_required_bottom_sheet.xml
+++ b/app/src/main/res/layout/recaptcha_required_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/recent_photo_view.xml b/app/src/main/res/layout/recent_photo_view.xml
index 5d6db9fa30..f581cf11b7 100644
--- a/app/src/main/res/layout/recent_photo_view.xml
+++ b/app/src/main/res/layout/recent_photo_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
 <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/photo_list"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/recent_photo_view_item.xml b/app/src/main/res/layout/recent_photo_view_item.xml
index 9db854bb03..df52cc12e8 100644
--- a/app/src/main/res/layout/recent_photo_view_item.xml
+++ b/app/src/main/res/layout/recent_photo_view_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SquareFrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index bfd6d5b000..6c830241b2 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/recipient_filter_item.xml b/app/src/main/res/layout/recipient_filter_item.xml
index de6f2ecb4b..761147f8a2 100644
--- a/app/src/main/res/layout/recipient_filter_item.xml
+++ b/app/src/main/res/layout/recipient_filter_item.xml
@@ -19,6 +19,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     style="?android:attr/dropDownItemStyle"
     android:orientation="vertical"
     android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/recipient_preference_contact_widget.xml b/app/src/main/res/layout/recipient_preference_contact_widget.xml
index 2707908ae1..f8b44753cf 100644
--- a/app/src/main/res/layout/recipient_preference_contact_widget.xml
+++ b/app/src/main/res/layout/recipient_preference_contact_widget.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/recipient_preference_photo_rail.xml b/app/src/main/res/layout/recipient_preference_photo_rail.xml
index 2dbb71d6a3..741563ec8c 100644
--- a/app/src/main/res/layout/recipient_preference_photo_rail.xml
+++ b/app/src/main/res/layout/recipient_preference_photo_rail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    tools:viewBindingIgnore="true"
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/photo_list"
diff --git a/app/src/main/res/layout/recipient_preference_photo_rail_item.xml b/app/src/main/res/layout/recipient_preference_photo_rail_item.xml
index bfe4ce2254..f1f176808e 100644
--- a/app/src/main/res/layout/recipient_preference_photo_rail_item.xml
+++ b/app/src/main/res/layout/recipient_preference_photo_rail_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/recording_layout.xml b/app/src/main/res/layout/recording_layout.xml
index dec1b46437..fbdef2b884 100644
--- a/app/src/main/res/layout/recording_layout.xml
+++ b/app/src/main/res/layout/recording_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recording_container"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/recycler_view_fast_scroller.xml b/app/src/main/res/layout/recycler_view_fast_scroller.xml
index 2edd24c130..21d6b1d2da 100644
--- a/app/src/main/res/layout/recycler_view_fast_scroller.xml
+++ b/app/src/main/res/layout/recycler_view_fast_scroller.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
        android:layout_width="wrap_content"
        android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/redeeming_gift_dialog.xml b/app/src/main/res/layout/redeeming_gift_dialog.xml
index fb4ba830ee..81bd43718b 100644
--- a/app/src/main/res/layout/redeeming_gift_dialog.xml
+++ b/app/src/main/res/layout/redeeming_gift_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/registration_lock_v2_dialog.xml b/app/src/main/res/layout/registration_lock_v2_dialog.xml
index 1b13b81a1b..d4e0a18285 100644
--- a/app/src/main/res/layout/registration_lock_v2_dialog.xml
+++ b/app/src/main/res/layout/registration_lock_v2_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/reminder_action_button.xml b/app/src/main/res/layout/reminder_action_button.xml
index 3c43b5a03e..28b970d2f7 100644
--- a/app/src/main/res/layout/reminder_action_button.xml
+++ b/app/src/main/res/layout/reminder_action_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     style="@style/Widget.AppCompat.Button.Borderless"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/reminder_header.xml b/app/src/main/res/layout/reminder_header.xml
index acb4696b20..fe39d3a8be 100644
--- a/app/src/main/res/layout/reminder_header.xml
+++ b/app/src/main/res/layout/reminder_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/revealable_message_view.xml b/app/src/main/res/layout/revealable_message_view.xml
index 65d0cf87d1..a8999a9728 100644
--- a/app/src/main/res/layout/revealable_message_view.xml
+++ b/app/src/main/res/layout/revealable_message_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:parentTag="android.widget.LinearLayout">
diff --git a/app/src/main/res/layout/review_banner_view.xml b/app/src/main/res/layout/review_banner_view.xml
index 4eeb448432..28e9fef5c0 100644
--- a/app/src/main/res/layout/review_banner_view.xml
+++ b/app/src/main/res/layout/review_banner_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/review_banner"
diff --git a/app/src/main/res/layout/review_card.xml b/app/src/main/res/layout/review_card.xml
index cfe1e3fb18..b2995b61ba 100644
--- a/app/src/main/res/layout/review_card.xml
+++ b/app/src/main/res/layout/review_card.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/safety_number_bottom_sheet.xml b/app/src/main/res/layout/safety_number_bottom_sheet.xml
index d34de31080..3c91890397 100644
--- a/app/src/main/res/layout/safety_number_bottom_sheet.xml
+++ b/app/src/main/res/layout/safety_number_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/safety_number_bucket_row_item.xml b/app/src/main/res/layout/safety_number_bucket_row_item.xml
index 4825f13c2d..6d5a09d472 100644
--- a/app/src/main/res/layout/safety_number_bucket_row_item.xml
+++ b/app/src/main/res/layout/safety_number_bucket_row_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/safety_number_change_dialog.xml b/app/src/main/res/layout/safety_number_change_dialog.xml
index 5904bcdfae..13ab98b46f 100644
--- a/app/src/main/res/layout/safety_number_change_dialog.xml
+++ b/app/src/main/res/layout/safety_number_change_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/safety_number_change_recipient.xml b/app/src/main/res/layout/safety_number_change_recipient.xml
index af5136962b..012b1e7f5f 100644
--- a/app/src/main/res/layout/safety_number_change_recipient.xml
+++ b/app/src/main/res/layout/safety_number_change_recipient.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/safety_number_changed_learn_more_dialog.xml b/app/src/main/res/layout/safety_number_changed_learn_more_dialog.xml
index 08b7fb1315..44e98a49f7 100644
--- a/app/src/main/res/layout/safety_number_changed_learn_more_dialog.xml
+++ b/app/src/main/res/layout/safety_number_changed_learn_more_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/safety_number_recipient_row_item.xml b/app/src/main/res/layout/safety_number_recipient_row_item.xml
index 1e62d74332..9384488870 100644
--- a/app/src/main/res/layout/safety_number_recipient_row_item.xml
+++ b/app/src/main/res/layout/safety_number_recipient_row_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/safety_number_review_fragment.xml b/app/src/main/res/layout/safety_number_review_fragment.xml
index 6b4bc2ac9a..05ee98024c 100644
--- a/app/src/main/res/layout/safety_number_review_fragment.xml
+++ b/app/src/main/res/layout/safety_number_review_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml b/app/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml
index 181b7e49a1..d8330c3754 100644
--- a/app/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml
+++ b/app/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.MediaKeyboard
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/emoji_drawer"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/scribble_select_new_sticker_activity.xml b/app/src/main/res/layout/scribble_select_new_sticker_activity.xml
index a99e01fd22..133514f87d 100644
--- a/app/src/main/res/layout/scribble_select_new_sticker_activity.xml
+++ b/app/src/main/res/layout/scribble_select_new_sticker_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.MediaKeyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/emoji_drawer"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/search_toolbar.xml b/app/src/main/res/layout/search_toolbar.xml
index 73a5e7b12e..fb77d49e2a 100644
--- a/app/src/main/res/layout/search_toolbar.xml
+++ b/app/src/main/res/layout/search_toolbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:orientation="vertical"
diff --git a/app/src/main/res/layout/select_featured_badge_fragment.xml b/app/src/main/res/layout/select_featured_badge_fragment.xml
index 555474ab0c..306fe4eca7 100644
--- a/app/src/main/res/layout/select_featured_badge_fragment.xml
+++ b/app/src/main/res/layout/select_featured_badge_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/set_currency_fragment.xml b/app/src/main/res/layout/set_currency_fragment.xml
index a9b2a05467..f9ed567774 100644
--- a/app/src/main/res/layout/set_currency_fragment.xml
+++ b/app/src/main/res/layout/set_currency_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/settings_wrapper_fragment.xml b/app/src/main/res/layout/settings_wrapper_fragment.xml
index d586d8d0e0..4b90c8a917 100644
--- a/app/src/main/res/layout/settings_wrapper_fragment.xml
+++ b/app/src/main/res/layout/settings_wrapper_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
diff --git a/app/src/main/res/layout/share_activity_v2.xml b/app/src/main/res/layout/share_activity_v2.xml
index f7172a7e47..0c34f0b82b 100644
--- a/app/src/main/res/layout/share_activity_v2.xml
+++ b/app/src/main/res/layout/share_activity_v2.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/share_contact_selection_item.xml b/app/src/main/res/layout/share_contact_selection_item.xml
index 339e4ab10f..d256b28191 100644
--- a/app/src/main/res/layout/share_contact_selection_item.xml
+++ b/app/src/main/res/layout/share_contact_selection_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recipient_view_name"
     style="@style/Signal.Text.Preview"
diff --git a/app/src/main/res/layout/share_interstitial_activity.xml b/app/src/main/res/layout/share_interstitial_activity.xml
index c3ed5a9c64..20038c27f7 100644
--- a/app/src/main/res/layout/share_interstitial_activity.xml
+++ b/app/src/main/res/layout/share_interstitial_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/shared_contact_view.xml b/app/src/main/res/layout/shared_contact_view.xml
index 0c019da2d0..a212bd615a 100644
--- a/app/src/main/res/layout/shared_contact_view.xml
+++ b/app/src/main/res/layout/shared_contact_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/show_admin_bottom_sheet.xml b/app/src/main/res/layout/show_admin_bottom_sheet.xml
index c30040f7c0..ea8325768e 100644
--- a/app/src/main/res/layout/show_admin_bottom_sheet.xml
+++ b/app/src/main/res/layout/show_admin_bottom_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/signal_bottom_action_bar_item.xml b/app/src/main/res/layout/signal_bottom_action_bar_item.xml
index da9db31ac8..0d8ca7d37b 100644
--- a/app/src/main/res/layout/signal_bottom_action_bar_item.xml
+++ b/app/src/main/res/layout/signal_bottom_action_bar_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/signal_context_menu.xml b/app/src/main/res/layout/signal_context_menu.xml
index d875363a90..752b14af41 100644
--- a/app/src/main/res/layout/signal_context_menu.xml
+++ b/app/src/main/res/layout/signal_context_menu.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/signal_context_menu_list"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/signal_context_menu_item.xml b/app/src/main/res/layout/signal_context_menu_item.xml
index 19187f67cd..c424942b3f 100644
--- a/app/src/main/res/layout/signal_context_menu_item.xml
+++ b/app/src/main/res/layout/signal_context_menu_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/signal_map_view.xml b/app/src/main/res/layout/signal_map_view.xml
index dd87d28f8e..cebb8bb231 100644
--- a/app/src/main/res/layout/signal_map_view.xml
+++ b/app/src/main/res/layout/signal_map_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools">
+    tools:viewBindingIgnore="true"
 
     <FrameLayout android:layout_width="match_parent"
                  android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/single_select_item.xml b/app/src/main/res/layout/single_select_item.xml
index d4fb5572f9..d2da74be4f 100644
--- a/app/src/main/res/layout/single_select_item.xml
+++ b/app/src/main/res/layout/single_select_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/splash_image.xml b/app/src/main/res/layout/splash_image.xml
index 3524641f16..42ebd2efaa 100644
--- a/app/src/main/res/layout/splash_image.xml
+++ b/app/src/main/res/layout/splash_image.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:srcCompat="@drawable/ic_card_process" />
diff --git a/app/src/main/res/layout/sticker_grid_header.xml b/app/src/main/res/layout/sticker_grid_header.xml
index 35f83831de..fec54076cb 100644
--- a/app/src/main/res/layout/sticker_grid_header.xml
+++ b/app/src/main/res/layout/sticker_grid_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/sticker_grid_header_title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/sticker_keyboard_page_list_item.xml b/app/src/main/res/layout/sticker_keyboard_page_list_item.xml
index 0df4042e84..4753f30acc 100644
--- a/app/src/main/res/layout/sticker_keyboard_page_list_item.xml
+++ b/app/src/main/res/layout/sticker_keyboard_page_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackgroundBorderless">
diff --git a/app/src/main/res/layout/sticker_management_activity.xml b/app/src/main/res/layout/sticker_management_activity.xml
index 76fed513ed..cb86910410 100644
--- a/app/src/main/res/layout/sticker_management_activity.xml
+++ b/app/src/main/res/layout/sticker_management_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/sticker_management_empty_item.xml b/app/src/main/res/layout/sticker_management_empty_item.xml
index 2b7352e99f..23258536b4 100644
--- a/app/src/main/res/layout/sticker_management_empty_item.xml
+++ b/app/src/main/res/layout/sticker_management_empty_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/sticker_management_header_item.xml b/app/src/main/res/layout/sticker_management_header_item.xml
index 8971080e1f..f320ffc273 100644
--- a/app/src/main/res/layout/sticker_management_header_item.xml
+++ b/app/src/main/res/layout/sticker_management_header_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/sticker_management_header"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/sticker_management_sticker_item.xml b/app/src/main/res/layout/sticker_management_sticker_item.xml
index b34a8b8387..94ea3bf832 100644
--- a/app/src/main/res/layout/sticker_management_sticker_item.xml
+++ b/app/src/main/res/layout/sticker_management_sticker_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/sticker_preview_activity.xml b/app/src/main/res/layout/sticker_preview_activity.xml
index c4c1485109..1f79bb143f 100644
--- a/app/src/main/res/layout/sticker_preview_activity.xml
+++ b/app/src/main/res/layout/sticker_preview_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/sticker_preview_list_item.xml b/app/src/main/res/layout/sticker_preview_list_item.xml
index 7e0d764265..fe1923dd17 100644
--- a/app/src/main/res/layout/sticker_preview_list_item.xml
+++ b/app/src/main/res/layout/sticker_preview_list_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/sticker_install_item_image"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/sticker_preview_popup.xml b/app/src/main/res/layout/sticker_preview_popup.xml
index 36ce92cd6c..491c439171 100644
--- a/app/src/main/res/layout/sticker_preview_popup.xml
+++ b/app/src/main/res/layout/sticker_preview_popup.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/sticker_search_dialog_fragment.xml b/app/src/main/res/layout/sticker_search_dialog_fragment.xml
index 23af00c4a4..1cf86ce1af 100644
--- a/app/src/main/res/layout/sticker_search_dialog_fragment.xml
+++ b/app/src/main/res/layout/sticker_search_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/sticker_suggestion_list_item.xml b/app/src/main/res/layout/sticker_suggestion_list_item.xml
index b4fe548cf9..d1f3e34dc5 100644
--- a/app/src/main/res/layout/sticker_suggestion_list_item.xml
+++ b/app/src/main/res/layout/sticker_suggestion_list_item.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/sticker_view.xml b/app/src/main/res/layout/sticker_view.xml
index 634bc07d4f..602ef64701 100644
--- a/app/src/main/res/layout/sticker_view.xml
+++ b/app/src/main/res/layout/sticker_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:parentTag="org.thoughtcrime.securesms.components.BorderlessImageView">
diff --git a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
index dffe76d430..bad2a17c19 100644
--- a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/stories_choose_group_bottom_bar.xml b/app/src/main/res/layout/stories_choose_group_bottom_bar.xml
index 82d1e6f7e1..c29eaa0cca 100644
--- a/app/src/main/res/layout/stories_choose_group_bottom_bar.xml
+++ b/app/src/main/res/layout/stories_choose_group_bottom_bar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_choose_group_bottom_sheet.xml b/app/src/main/res/layout/stories_choose_group_bottom_sheet.xml
index 420c6f7f63..c268f77be7 100644
--- a/app/src/main/res/layout/stories_choose_group_bottom_sheet.xml
+++ b/app/src/main/res/layout/stories_choose_group_bottom_sheet.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_create_story_name_field_item.xml b/app/src/main/res/layout/stories_create_story_name_field_item.xml
index 30862e6b6f..c73a809734 100644
--- a/app/src/main/res/layout/stories_create_story_name_field_item.xml
+++ b/app/src/main/res/layout/stories_create_story_name_field_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_create_with_recipients_fragment.xml b/app/src/main/res/layout/stories_create_with_recipients_fragment.xml
index 3e111fc6b6..8a0f679157 100644
--- a/app/src/main/res/layout/stories_create_with_recipients_fragment.xml
+++ b/app/src/main/res/layout/stories_create_with_recipients_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/stories_edit_story_name_fragment.xml b/app/src/main/res/layout/stories_edit_story_name_fragment.xml
index 0f63c7d4e4..5de14c4c43 100644
--- a/app/src/main/res/layout/stories_edit_story_name_fragment.xml
+++ b/app/src/main/res/layout/stories_edit_story_name_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/stories_group_replies_fragment.xml b/app/src/main/res/layout/stories_group_replies_fragment.xml
index 949c32e2a5..1ecb934529 100644
--- a/app/src/main/res/layout/stories_group_replies_fragment.xml
+++ b/app/src/main/res/layout/stories_group_replies_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_group_text_reply_item.xml b/app/src/main/res/layout/stories_group_text_reply_item.xml
index d0d65ecb1b..b15f32d98c 100644
--- a/app/src/main/res/layout/stories_group_text_reply_item.xml
+++ b/app/src/main/res/layout/stories_group_text_reply_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_image_content_fragment.xml b/app/src/main/res/layout/stories_image_content_fragment.xml
index 01ee7f65de..81397ad49c 100644
--- a/app/src/main/res/layout/stories_image_content_fragment.xml
+++ b/app/src/main/res/layout/stories_image_content_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <ImageView
diff --git a/app/src/main/res/layout/stories_landing_fragment.xml b/app/src/main/res/layout/stories_landing_fragment.xml
index b12e8e5b99..6224848981 100644
--- a/app/src/main/res/layout/stories_landing_fragment.xml
+++ b/app/src/main/res/layout/stories_landing_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/stories_landing_item.xml b/app/src/main/res/layout/stories_landing_item.xml
index 4dfd1f595f..3a4f69a0cb 100644
--- a/app/src/main/res/layout/stories_landing_item.xml
+++ b/app/src/main/res/layout/stories_landing_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_landing_item_my_stories.xml b/app/src/main/res/layout/stories_landing_item_my_stories.xml
index d005457284..f4b55385f6 100644
--- a/app/src/main/res/layout/stories_landing_item_my_stories.xml
+++ b/app/src/main/res/layout/stories_landing_item_my_stories.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_link_popup.xml b/app/src/main/res/layout/stories_link_popup.xml
index 381642e404..5ab58ed1ac 100644
--- a/app/src/main/res/layout/stories_link_popup.xml
+++ b/app/src/main/res/layout/stories_link_popup.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="275dp"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_multiselect_forward_activity.xml b/app/src/main/res/layout/stories_multiselect_forward_activity.xml
index e8a68f60fc..4a51860d05 100644
--- a/app/src/main/res/layout/stories_multiselect_forward_activity.xml
+++ b/app/src/main/res/layout/stories_multiselect_forward_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/stories_my_stories_fragment.xml b/app/src/main/res/layout/stories_my_stories_fragment.xml
index cc7ae796a6..b2c3ba7336 100644
--- a/app/src/main/res/layout/stories_my_stories_fragment.xml
+++ b/app/src/main/res/layout/stories_my_stories_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/stories_my_stories_item.xml b/app/src/main/res/layout/stories_my_stories_item.xml
index 07b43292c1..d69be2e9f8 100644
--- a/app/src/main/res/layout/stories_my_stories_item.xml
+++ b/app/src/main/res/layout/stories_my_stories_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_private_story_add_viewer_item.xml b/app/src/main/res/layout/stories_private_story_add_viewer_item.xml
index 689245e147..3d886bacae 100644
--- a/app/src/main/res/layout/stories_private_story_add_viewer_item.xml
+++ b/app/src/main/res/layout/stories_private_story_add_viewer_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_private_story_item.xml b/app/src/main/res/layout/stories_private_story_item.xml
index 977623cee3..d4dd64ca30 100644
--- a/app/src/main/res/layout/stories_private_story_item.xml
+++ b/app/src/main/res/layout/stories_private_story_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_private_story_new_item.xml b/app/src/main/res/layout/stories_private_story_new_item.xml
index 375ec91e74..3a2195114c 100644
--- a/app/src/main/res/layout/stories_private_story_new_item.xml
+++ b/app/src/main/res/layout/stories_private_story_new_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_private_story_recipient_item.xml b/app/src/main/res/layout/stories_private_story_recipient_item.xml
index 2849e156f2..0a411e81c8 100644
--- a/app/src/main/res/layout/stories_private_story_recipient_item.xml
+++ b/app/src/main/res/layout/stories_private_story_recipient_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_reaction_bar.xml b/app/src/main/res/layout/stories_reaction_bar.xml
index 6e2e8dfe2c..420d7565b7 100644
--- a/app/src/main/res/layout/stories_reaction_bar.xml
+++ b/app/src/main/res/layout/stories_reaction_bar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/reaction_scrubber_width"
     android:layout_height="56dp"
diff --git a/app/src/main/res/layout/stories_reaction_bar_layout.xml b/app/src/main/res/layout/stories_reaction_bar_layout.xml
index b1e6684333..92b18ddbe8 100644
--- a/app/src/main/res/layout/stories_reaction_bar_layout.xml
+++ b/app/src/main/res/layout/stories_reaction_bar_layout.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:maxHeight="56dp">
diff --git a/app/src/main/res/layout/stories_recipient_item.xml b/app/src/main/res/layout/stories_recipient_item.xml
index cd1be775a8..429836e0aa 100644
--- a/app/src/main/res/layout/stories_recipient_item.xml
+++ b/app/src/main/res/layout/stories_recipient_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_reply_to_story_composer.xml b/app/src/main/res/layout/stories_reply_to_story_composer.xml
index cffc811cf2..a06a50ff29 100644
--- a/app/src/main/res/layout/stories_reply_to_story_composer.xml
+++ b/app/src/main/res/layout/stories_reply_to_story_composer.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/input_aware_layout"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/stories_reply_to_story_composer_content.xml b/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
index 0a7fed822d..8ac3828473 100644
--- a/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
+++ b/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_reply_to_story_fragment.xml b/app/src/main/res/layout/stories_reply_to_story_fragment.xml
index 9a0e56b33c..1916081da4 100644
--- a/app/src/main/res/layout/stories_reply_to_story_fragment.xml
+++ b/app/src/main/res/layout/stories_reply_to_story_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/stories_shared_element_crossfader.xml b/app/src/main/res/layout/stories_shared_element_crossfader.xml
index 2d54f412b9..b647727361 100644
--- a/app/src/main/res/layout/stories_shared_element_crossfader.xml
+++ b/app/src/main/res/layout/stories_shared_element_crossfader.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_signal_connection_bottom_sheet.xml b/app/src/main/res/layout/stories_signal_connection_bottom_sheet.xml
index dd5a0af11f..75839b7cba 100644
--- a/app/src/main/res/layout/stories_signal_connection_bottom_sheet.xml
+++ b/app/src/main/res/layout/stories_signal_connection_bottom_sheet.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/stories_slate_view.xml b/app/src/main/res/layout/stories_slate_view.xml
index de8ff96851..5462815779 100644
--- a/app/src/main/res/layout/stories_slate_view.xml
+++ b/app/src/main/res/layout/stories_slate_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_story_view_item.xml b/app/src/main/res/layout/stories_story_view_item.xml
index d49f4b066a..0819051f98 100644
--- a/app/src/main/res/layout/stories_story_view_item.xml
+++ b/app/src/main/res/layout/stories_story_view_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_text_post_creation_fragment.xml b/app/src/main/res/layout/stories_text_post_creation_fragment.xml
index 1ae1743db8..a1b2b28f4a 100644
--- a/app/src/main/res/layout/stories_text_post_creation_fragment.xml
+++ b/app/src/main/res/layout/stories_text_post_creation_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/scene"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/stories_text_post_link_entry_content.xml b/app/src/main/res/layout/stories_text_post_link_entry_content.xml
index d5d7b493da..b92e9fdd1f 100644
--- a/app/src/main/res/layout/stories_text_post_link_entry_content.xml
+++ b/app/src/main/res/layout/stories_text_post_link_entry_content.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_text_post_link_entry_fragment.xml b/app/src/main/res/layout/stories_text_post_link_entry_fragment.xml
index c9ebcaedc3..f36f934a60 100644
--- a/app/src/main/res/layout/stories_text_post_link_entry_fragment.xml
+++ b/app/src/main/res/layout/stories_text_post_link_entry_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/stories_text_post_link_preview.xml b/app/src/main/res/layout/stories_text_post_link_preview.xml
index d360f7215a..a6464a4472 100644
--- a/app/src/main/res/layout/stories_text_post_link_preview.xml
+++ b/app/src/main/res/layout/stories_text_post_link_preview.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/stories_text_post_link_preview_spinner.xml b/app/src/main/res/layout/stories_text_post_link_preview_spinner.xml
index a120cf7188..ac78fb3cd4 100644
--- a/app/src/main/res/layout/stories_text_post_link_preview_spinner.xml
+++ b/app/src/main/res/layout/stories_text_post_link_preview_spinner.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.progressindicator.CircularProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/loading_spinner"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/stories_text_post_preview_fragment.xml b/app/src/main/res/layout/stories_text_post_preview_fragment.xml
index 6b71ce7d5a..b128639e9b 100644
--- a/app/src/main/res/layout/stories_text_post_preview_fragment.xml
+++ b/app/src/main/res/layout/stories_text_post_preview_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.stories.StoryTextPostView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/story_text_post"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_text_post_text_entry_content.xml b/app/src/main/res/layout/stories_text_post_text_entry_content.xml
index ea8a5b768a..3a25a8afb4 100644
--- a/app/src/main/res/layout/stories_text_post_text_entry_content.xml
+++ b/app/src/main/res/layout/stories_text_post_text_entry_content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/scene"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/stories_text_post_text_entry_fragment.xml b/app/src/main/res/layout/stories_text_post_text_entry_fragment.xml
index 7407192f1a..6c63baf35f 100644
--- a/app/src/main/res/layout/stories_text_post_text_entry_fragment.xml
+++ b/app/src/main/res/layout/stories_text_post_text_entry_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/stories_text_post_view.xml b/app/src/main/res/layout/stories_text_post_view.xml
index b3fe157d68..6ba7ee44b3 100644
--- a/app/src/main/res/layout/stories_text_post_view.xml
+++ b/app/src/main/res/layout/stories_text_post_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_viewer_fragment.xml b/app/src/main/res/layout/stories_viewer_fragment.xml
index 2441896423..3363f2dd03 100644
--- a/app/src/main/res/layout/stories_viewer_fragment.xml
+++ b/app/src/main/res/layout/stories_viewer_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/stories_viewer_fragment_page.xml b/app/src/main/res/layout/stories_viewer_fragment_page.xml
index f8289f6840..8ebd38066b 100644
--- a/app/src/main/res/layout/stories_viewer_fragment_page.xml
+++ b/app/src/main/res/layout/stories_viewer_fragment_page.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_views_and_replies_fragment.xml b/app/src/main/res/layout/stories_views_and_replies_fragment.xml
index 7c165dcb88..ad76b54fb2 100644
--- a/app/src/main/res/layout/stories_views_and_replies_fragment.xml
+++ b/app/src/main/res/layout/stories_views_and_replies_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/stories_views_fragment.xml b/app/src/main/res/layout/stories_views_fragment.xml
index 1a0547845f..1fb8b59569 100644
--- a/app/src/main/res/layout/stories_views_fragment.xml
+++ b/app/src/main/res/layout/stories_views_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/story_first_time_navigation_view.xml b/app/src/main/res/layout/story_first_time_navigation_view.xml
index 45883e89b3..b781d6fc9a 100644
--- a/app/src/main/res/layout/story_first_time_navigation_view.xml
+++ b/app/src/main/res/layout/story_first_time_navigation_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/app/src/main/res/layout/story_info_header.xml b/app/src/main/res/layout/story_info_header.xml
index 84a39efa42..f43a5ee5cf 100644
--- a/app/src/main/res/layout/story_info_header.xml
+++ b/app/src/main/res/layout/story_info_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/story_info_recipient_row.xml b/app/src/main/res/layout/story_info_recipient_row.xml
index 2cb87ee8b6..d227f65416 100644
--- a/app/src/main/res/layout/story_info_recipient_row.xml
+++ b/app/src/main/res/layout/story_info_recipient_row.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/story_viewer_first_time_navigation_stub.xml b/app/src/main/res/layout/story_viewer_first_time_navigation_stub.xml
index dd6a097e54..3ed0446c96 100644
--- a/app/src/main/res/layout/story_viewer_first_time_navigation_stub.xml
+++ b/app/src/main/res/layout/story_viewer_first_time_navigation_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.stories.StoryFirstTimeNavigationView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/app/src/main/res/layout/story_volume_overlay_view.xml b/app/src/main/res/layout/story_volume_overlay_view.xml
index f4a37f74f2..268dacd8ea 100644
--- a/app/src/main/res/layout/story_volume_overlay_view.xml
+++ b/app/src/main/res/layout/story_volume_overlay_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/submit_debug_log_activity.xml b/app/src/main/res/layout/submit_debug_log_activity.xml
index 3e080e77a5..71a77b3548 100644
--- a/app/src/main/res/layout/submit_debug_log_activity.xml
+++ b/app/src/main/res/layout/submit_debug_log_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/submit_debug_log_line_item.xml b/app/src/main/res/layout/submit_debug_log_line_item.xml
index 8f09913607..9e7e5e46d9 100644
--- a/app/src/main/res/layout/submit_debug_log_line_item.xml
+++ b/app/src/main/res/layout/submit_debug_log_line_item.xml
@@ -1,4 +1,6 @@
 <org.thoughtcrime.securesms.components.ListenableHorizontalScrollView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/log_item_scroll"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/subscribe_activity.xml b/app/src/main/res/layout/subscribe_activity.xml
index 4f27c29e65..2cb637c607 100644
--- a/app/src/main/res/layout/subscribe_activity.xml
+++ b/app/src/main/res/layout/subscribe_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
diff --git a/app/src/main/res/layout/subscribe_fragment.xml b/app/src/main/res/layout/subscribe_fragment.xml
index b095d4ce39..1f16544761 100644
--- a/app/src/main/res/layout/subscribe_fragment.xml
+++ b/app/src/main/res/layout/subscribe_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml
index b609887a44..83e9ae4423 100644
--- a/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/subscription_currency_selection.xml b/app/src/main/res/layout/subscription_currency_selection.xml
index e6f3826b66..496b4e6f80 100644
--- a/app/src/main/res/layout/subscription_currency_selection.xml
+++ b/app/src/main/res/layout/subscription_currency_selection.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml b/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
index 7db9295af1..2fddb2061e 100644
--- a/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
+++ b/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/subscription_preference.xml b/app/src/main/res/layout/subscription_preference.xml
index cdb5869561..8346480d23 100644
--- a/app/src/main/res/layout/subscription_preference.xml
+++ b/app/src/main/res/layout/subscription_preference.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/subscription_preference_loader.xml b/app/src/main/res/layout/subscription_preference_loader.xml
index 0bd711d502..8f012d836f 100644
--- a/app/src/main/res/layout/subscription_preference_loader.xml
+++ b/app/src/main/res/layout/subscription_preference_loader.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/switch_compat_preference.xml b/app/src/main/res/layout/switch_compat_preference.xml
index db24334651..bfeeedb9e5 100644
--- a/app/src/main/res/layout/switch_compat_preference.xml
+++ b/app/src/main/res/layout/switch_compat_preference.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
                                         android:id="@android:id/checkbox"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/system_ui_guidelines.xml b/app/src/main/res/layout/system_ui_guidelines.xml
index 48cba9fc7b..3b5dcb827f 100644
--- a/app/src/main/res/layout/system_ui_guidelines.xml
+++ b/app/src/main/res/layout/system_ui_guidelines.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    tools:viewBindingIgnore="true"
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/status_bar_guideline"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/test_fragment.xml b/app/src/main/res/layout/test_fragment.xml
index fd962451a7..42fb6ab0a9 100644
--- a/app/src/main/res/layout/test_fragment.xml
+++ b/app/src/main/res/layout/test_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/text_avatar_creation_fragment.xml b/app/src/main/res/layout/text_avatar_creation_fragment.xml
index 6be43943bd..86704de310 100644
--- a/app/src/main/res/layout/text_avatar_creation_fragment.xml
+++ b/app/src/main/res/layout/text_avatar_creation_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/keyboard_aware_layout"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/text_avatar_creation_fragment_content.xml b/app/src/main/res/layout/text_avatar_creation_fragment_content.xml
index 1bd84423eb..40643b9445 100644
--- a/app/src/main/res/layout/text_avatar_creation_fragment_content.xml
+++ b/app/src/main/res/layout/text_avatar_creation_fragment_content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml b/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml
index 87af09875d..0232587eae 100644
--- a/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml
+++ b/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml
index 40c63cfe4f..592a48a82d 100644
--- a/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/thumbnail_view.xml b/app/src/main/res/layout/thumbnail_view.xml
index 9d3be4d75c..df9bca9afd 100644
--- a/app/src/main/res/layout/thumbnail_view.xml
+++ b/app/src/main/res/layout/thumbnail_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
diff --git a/app/src/main/res/layout/tooltip.xml b/app/src/main/res/layout/tooltip.xml
index 75bfccb1a4..a5c50153e4 100644
--- a/app/src/main/res/layout/tooltip.xml
+++ b/app/src/main/res/layout/tooltip.xml
@@ -2,6 +2,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/top_toast_popup.xml b/app/src/main/res/layout/top_toast_popup.xml
index 950ab0043d..5a5a0c9c63 100644
--- a/app/src/main/res/layout/top_toast_popup.xml
+++ b/app/src/main/res/layout/top_toast_popup.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/transfer_controls_stub.xml b/app/src/main/res/layout/transfer_controls_stub.xml
index 84a998c0ea..de0156a813 100644
--- a/app/src/main/res/layout/transfer_controls_stub.xml
+++ b/app/src/main/res/layout/transfer_controls_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.TransferControlView
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/transfer_controls"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/transfer_controls_view.xml b/app/src/main/res/layout/transfer_controls_view.xml
index e35de78c5a..ed8d4a3f95 100644
--- a/app/src/main/res/layout/transfer_controls_view.xml
+++ b/app/src/main/res/layout/transfer_controls_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="org.thoughtcrime.securesms.components.TransferControlView">
diff --git a/app/src/main/res/layout/transport_selection_list_item.xml b/app/src/main/res/layout/transport_selection_list_item.xml
index ea5a25115d..2132126c8f 100644
--- a/app/src/main/res/layout/transport_selection_list_item.xml
+++ b/app/src/main/res/layout/transport_selection_list_item.xml
@@ -2,6 +2,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
               android:orientation="horizontal"
               android:layout_width="@dimen/transport_selection_popup_width"
               android:layout_height="60dp"
diff --git a/app/src/main/res/layout/typing_indicator_view.xml b/app/src/main/res/layout/typing_indicator_view.xml
index 23a4cf19ef..6ef9f21e08 100644
--- a/app/src/main/res/layout/typing_indicator_view.xml
+++ b/app/src/main/res/layout/typing_indicator_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/unidentified_delivery_learn_more.xml b/app/src/main/res/layout/unidentified_delivery_learn_more.xml
index 10d3b0a9bc..2aa51d9dbb 100644
--- a/app/src/main/res/layout/unidentified_delivery_learn_more.xml
+++ b/app/src/main/res/layout/unidentified_delivery_learn_more.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/unverified_banner_view.xml b/app/src/main/res/layout/unverified_banner_view.xml
index 45751d1234..db6a971970 100644
--- a/app/src/main/res/layout/unverified_banner_view.xml
+++ b/app/src/main/res/layout/unverified_banner_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/container"
diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index 48bbaa9969..cd4bee503e 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/v2_media_add_message_dialog_fragment.xml b/app/src/main/res/layout/v2_media_add_message_dialog_fragment.xml
index bbe97abce0..c508983558 100644
--- a/app/src/main/res/layout/v2_media_add_message_dialog_fragment.xml
+++ b/app/src/main/res/layout/v2_media_add_message_dialog_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/hud"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml b/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
index 771c3ec607..50626f70ce 100644
--- a/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
+++ b/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/v2_media_count_indicator_button.xml b/app/src/main/res/layout/v2_media_count_indicator_button.xml
index 0b40f89514..5f7f1f74c4 100644
--- a/app/src/main/res/layout/v2_media_count_indicator_button.xml
+++ b/app/src/main/res/layout/v2_media_count_indicator_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v2_media_gallery_folder_item.xml b/app/src/main/res/layout/v2_media_gallery_folder_item.xml
index c6b9e52da0..a21059b463 100644
--- a/app/src/main/res/layout/v2_media_gallery_folder_item.xml
+++ b/app/src/main/res/layout/v2_media_gallery_folder_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/v2_media_gallery_fragment.xml b/app/src/main/res/layout/v2_media_gallery_fragment.xml
index 8f3f34a343..acd497c8c6 100644
--- a/app/src/main/res/layout/v2_media_gallery_fragment.xml
+++ b/app/src/main/res/layout/v2_media_gallery_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/v2_media_gallery_item.xml b/app/src/main/res/layout/v2_media_gallery_item.xml
index f76a39c2df..1e1e87a351 100644
--- a/app/src/main/res/layout/v2_media_gallery_item.xml
+++ b/app/src/main/res/layout/v2_media_gallery_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v2_media_gallery_item_no_check.xml b/app/src/main/res/layout/v2_media_gallery_item_no_check.xml
index 2074b0b260..0bf7e1beec 100644
--- a/app/src/main/res/layout/v2_media_gallery_item_no_check.xml
+++ b/app/src/main/res/layout/v2_media_gallery_item_no_check.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v2_media_image_editor_hud.xml b/app/src/main/res/layout/v2_media_image_editor_hud.xml
index 3db44de59b..f7254391e5 100644
--- a/app/src/main/res/layout/v2_media_image_editor_hud.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_hud.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml b/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
index f0058afe60..66f78d2fa9 100644
--- a/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputAwareLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools">
diff --git a/app/src/main/res/layout/v2_media_review_add_media_item.xml b/app/src/main/res/layout/v2_media_review_add_media_item.xml
index 8dfc0500ed..a228a694f0 100644
--- a/app/src/main/res/layout/v2_media_review_add_media_item.xml
+++ b/app/src/main/res/layout/v2_media_review_add_media_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.imageview.ShapeableImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/add_media"
     android:layout_width="48dp"
diff --git a/app/src/main/res/layout/v2_media_review_fragment.xml b/app/src/main/res/layout/v2_media_review_fragment.xml
index d5ced9b296..9f79e6381e 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/v2_media_review_selected_item.xml b/app/src/main/res/layout/v2_media_review_selected_item.xml
index d1e15c667a..6b79bc5d01 100644
--- a/app/src/main/res/layout/v2_media_review_selected_item.xml
+++ b/app/src/main/res/layout/v2_media_review_selected_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="48dp"
     android:layout_height="48dp"
diff --git a/app/src/main/res/layout/v2_media_selection_item.xml b/app/src/main/res/layout/v2_media_selection_item.xml
index e669032f04..8f702e30e4 100644
--- a/app/src/main/res/layout/v2_media_selection_item.xml
+++ b/app/src/main/res/layout/v2_media_selection_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="44dp"
     android:layout_height="44dp"
diff --git a/app/src/main/res/layout/value_click_preference_item.xml b/app/src/main/res/layout/value_click_preference_item.xml
index 90c6cf4c46..6599d7fcad 100644
--- a/app/src/main/res/layout/value_click_preference_item.xml
+++ b/app/src/main/res/layout/value_click_preference_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/vector_avatar_creation_fragment.xml b/app/src/main/res/layout/vector_avatar_creation_fragment.xml
index b8599480a9..d6d4249c2e 100644
--- a/app/src/main/res/layout/vector_avatar_creation_fragment.xml
+++ b/app/src/main/res/layout/vector_avatar_creation_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/verification_code_view.xml b/app/src/main/res/layout/verification_code_view.xml
index 1d6bfa265b..92ca6c23ea 100644
--- a/app/src/main/res/layout/verification_code_view.xml
+++ b/app/src/main/res/layout/verification_code_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/verification_pin_keyboard_view.xml b/app/src/main/res/layout/verification_pin_keyboard_view.xml
index c5c6bd0d54..0d9712f919 100644
--- a/app/src/main/res/layout/verification_pin_keyboard_view.xml
+++ b/app/src/main/res/layout/verification_pin_keyboard_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools">
+    tools:viewBindingIgnore="true"
 
     <org.thoughtcrime.securesms.components.NumericKeyboardView
             android:id="@+id/keyboard_view"
diff --git a/app/src/main/res/layout/verify_display_fragment.xml b/app/src/main/res/layout/verify_display_fragment.xml
index 1b70b61bbd..302c5987a7 100644
--- a/app/src/main/res/layout/verify_display_fragment.xml
+++ b/app/src/main/res/layout/verify_display_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/verify_scan_fragment.xml b/app/src/main/res/layout/verify_scan_fragment.xml
index 5753193e98..f4f4f66620 100644
--- a/app/src/main/res/layout/verify_scan_fragment.xml
+++ b/app/src/main/res/layout/verify_scan_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/verifying_recipient_payment_dialog.xml b/app/src/main/res/layout/verifying_recipient_payment_dialog.xml
index 131cca3ccb..3e140a714c 100644
--- a/app/src/main/res/layout/verifying_recipient_payment_dialog.xml
+++ b/app/src/main/res/layout/verifying_recipient_payment_dialog.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/video_editor_hud.xml b/app/src/main/res/layout/video_editor_hud.xml
index 58cb2246de..5c474e3b39 100644
--- a/app/src/main/res/layout/video_editor_hud.xml
+++ b/app/src/main/res/layout/video_editor_hud.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/video_player.xml b/app/src/main/res/layout/video_player.xml
index 8a958bcb94..d81ef5a09e 100644
--- a/app/src/main/res/layout/video_player.xml
+++ b/app/src/main/res/layout/video_player.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
index 1f83bec083..aaa15334fc 100644
--- a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment_page.xml b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment_page.xml
index 38bf239cca..046d109ff8 100644
--- a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment_page.xml
+++ b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment_page.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/view_once_message_activity.xml b/app/src/main/res/layout/view_once_message_activity.xml
index 8bcc735e37..bfffdb88bc 100644
--- a/app/src/main/res/layout/view_once_message_activity.xml
+++ b/app/src/main/res/layout/view_once_message_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/voice_note_draft_view.xml b/app/src/main/res/layout/voice_note_draft_view.xml
index 77393b9dbc..7b09c535c6 100644
--- a/app/src/main/res/layout/voice_note_draft_view.xml
+++ b/app/src/main/res/layout/voice_note_draft_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="android.widget.LinearLayout">
 
diff --git a/app/src/main/res/layout/voice_note_player_stub.xml b/app/src/main/res/layout/voice_note_player_stub.xml
index e41f1d3a19..357d0e84b4 100644
--- a/app/src/main/res/layout/voice_note_player_stub.xml
+++ b/app/src/main/res/layout/voice_note_player_stub.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/voice_note_player_view_background">
diff --git a/app/src/main/res/layout/voice_note_player_view.xml b/app/src/main/res/layout/voice_note_player_view.xml
index 6fb6125b4b..1605dd0b30 100644
--- a/app/src/main/res/layout/voice_note_player_view.xml
+++ b/app/src/main/res/layout/voice_note_player_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
diff --git a/app/src/main/res/layout/wallpaper_image_selection_activity.xml b/app/src/main/res/layout/wallpaper_image_selection_activity.xml
index 1d249e3e93..c53ed0067a 100644
--- a/app/src/main/res/layout/wallpaper_image_selection_activity.xml
+++ b/app/src/main/res/layout/wallpaper_image_selection_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/webrtc_answer_decline_button.xml b/app/src/main/res/layout/webrtc_answer_decline_button.xml
index b9a7e83e17..d1038d4ae3 100644
--- a/app/src/main/res/layout/webrtc_answer_decline_button.xml
+++ b/app/src/main/res/layout/webrtc_answer_decline_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clipToPadding="false"
diff --git a/app/src/main/res/layout/webrtc_answer_decline_button_accessible.xml b/app/src/main/res/layout/webrtc_answer_decline_button_accessible.xml
index 77a5862a0f..1dab4a8cd3 100644
--- a/app/src/main/res/layout/webrtc_answer_decline_button_accessible.xml
+++ b/app/src/main/res/layout/webrtc_answer_decline_button_accessible.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/merge"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/webrtc_call_activity.xml b/app/src/main/res/layout/webrtc_call_activity.xml
index b4a6ec8f9e..f0425dc2ff 100644
--- a/app/src/main/res/layout/webrtc_call_activity.xml
+++ b/app/src/main/res/layout/webrtc_call_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.webrtc.WebRtcCallView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:id="@+id/callScreen"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/webrtc_call_participant_recycler_empty_item.xml b/app/src/main/res/layout/webrtc_call_participant_recycler_empty_item.xml
index 6a7e92f908..672b699c41 100644
--- a/app/src/main/res/layout/webrtc_call_participant_recycler_empty_item.xml
+++ b/app/src/main/res/layout/webrtc_call_participant_recycler_empty_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Space xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     android:layout_width="54dp"
     android:layout_height="72dp"
     tools:background="@color/red"
diff --git a/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml b/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml
index 5c8f9ab721..9167c602fc 100644
--- a/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml
+++ b/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/webrtc_call_participants_layout.xml b/app/src/main/res/layout/webrtc_call_participants_layout.xml
index e6e14cf3b0..8c179d59c8 100644
--- a/app/src/main/res/layout/webrtc_call_participants_layout.xml
+++ b/app/src/main/res/layout/webrtc_call_participants_layout.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.webrtc.CallParticipantsLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/call_screen_call_participants"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index 06645ca5cf..565a47fe2e 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="org.thoughtcrime.securesms.components.webrtc.WebRtcCallView">
 
diff --git a/app/src/main/res/layout/webrtc_call_view_header_large.xml b/app/src/main/res/layout/webrtc_call_view_header_large.xml
index a0e21a1630..a3d1af26b2 100644
--- a/app/src/main/res/layout/webrtc_call_view_header_large.xml
+++ b/app/src/main/res/layout/webrtc_call_view_header_large.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/call_screen_header"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/webrtc_call_view_header_small.xml b/app/src/main/res/layout/webrtc_call_view_header_small.xml
index aa42d91acd..441f6d2d43 100644
--- a/app/src/main/res/layout/webrtc_call_view_header_small.xml
+++ b/app/src/main/res/layout/webrtc_call_view_header_small.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/call_screen_header"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/wifi_to_cellular_popup.xml b/app/src/main/res/layout/wifi_to_cellular_popup.xml
index 7849a8a94b..97d21ab697 100644
--- a/app/src/main/res/layout/wifi_to_cellular_popup.xml
+++ b/app/src/main/res/layout/wifi_to_cellular_popup.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="94dp">
diff --git a/app/src/main/res/layout/zooming_image_view.xml b/app/src/main/res/layout/zooming_image_view.xml
index da1c60519b..b7c246d1d2 100644
--- a/app/src/main/res/layout/zooming_image_view.xml
+++ b/app/src/main/res/layout/zooming_image_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
        tools:context="org.thoughtcrime.securesms.components.ZoomingImageView">
 
     <com.github.chrisbanes.photoview.PhotoView android:id="@+id/image_view"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 8dddcca499..bd4d73e7c4 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -381,6 +381,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6a23cc88e91663e6303cf4356d3ad57b9c220107dfff44af571a9fb185b39e75" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="viewbinding" version="7.0.3">
+         <artifact name="viewbinding-7.0.3.aar">
+            <sha256 value="b58b61f7bb379a1491e0686af44ec692df77c3d19a3f9fd4250873d7a56c892a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewbinding-7.0.3.module">
+            <sha256 value="615ba2996eec4163c918cc1a61301dcd927e677e8f9cc0b3792a650018cb803b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.documentfile" name="documentfile" version="1.0.0">
          <artifact name="documentfile-1.0.0.aar">
             <sha256 value="865a061ef2fad16522f8433536b8d47208c46ff7c7745197dfa1eeb481869487" origin="Generated by Gradle"/>