diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
index c3602b0e946..9b778df86f3 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml
@@ -85,7 +85,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/administrator_controls_guideline"
-        app:layout_constraintTop_toBottomOf="@id/extra_controls_title" />
+        app:layout_constraintTop_toBottomOf="@id/extra_controls_title"
+        tools:ignore="InconsistentLayout" />
 
       <View
         android:id="@+id/administrator_controls_toolbar_shadow_view"
diff --git a/app/src/main/res/layout-sw600dp/help_activity.xml b/app/src/main/res/layout-sw600dp/help_activity.xml
index 03bb720fe6c..da08b27f68d 100644
--- a/app/src/main/res/layout-sw600dp/help_activity.xml
+++ b/app/src/main/res/layout-sw600dp/help_activity.xml
@@ -47,7 +47,8 @@
         android:visibility="gone"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_arrow_back_black_24_dp" />
+        app:srcCompat="@drawable/ic_arrow_back_black_24_dp"
+        tools:ignore="InconsistentLayout" />
 
       <TextView
         android:id="@+id/help_multipane_options_title_textview"
@@ -61,7 +62,8 @@
         android:textColor="@color/component_color_shared_primary_text_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/help_multipane_options_back_button"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="InconsistentLayout" />
 
       <FrameLayout
         android:id="@+id/multipane_options_container"
@@ -71,7 +73,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/multipane_guideline"
-        app:layout_constraintTop_toBottomOf="@id/help_multipane_options_title_textview" />
+        app:layout_constraintTop_toBottomOf="@id/help_multipane_options_title_textview"
+        tools:ignore="InconsistentLayout" />
 
       <androidx.constraintlayout.widget.Guideline
         android:id="@+id/multipane_guideline"
diff --git a/app/src/main/res/layout-sw600dp/option_activity.xml b/app/src/main/res/layout-sw600dp/option_activity.xml
index c00e25a3e01..e1c7205a067 100644
--- a/app/src/main/res/layout-sw600dp/option_activity.xml
+++ b/app/src/main/res/layout-sw600dp/option_activity.xml
@@ -45,7 +45,8 @@
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="InconsistentLayout" />
 
       <FrameLayout
         android:id="@+id/multipane_options_container"
@@ -55,7 +56,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/multipane_guideline"
-        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title" />
+        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title"
+        tools:ignore="InconsistentLayout" />
 
       <androidx.constraintlayout.widget.Guideline
         android:id="@+id/multipane_guideline"
diff --git a/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml b/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml
index c28d196ca3f..3f94428a4e9 100644
--- a/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml
+++ b/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml
@@ -1,5 +1,6 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/options_activity_drawer_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -44,7 +45,8 @@
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/multipane_guideline"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="InconsistentLayout" />
 
       <FrameLayout
         android:id="@+id/multipane_options_container"
@@ -54,7 +56,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/multipane_guideline"
-        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title" />
+        app:layout_constraintTop_toBottomOf="@id/options_activity_selected_options_title"
+        tools:ignore="InconsistentLayout" />
 
       <androidx.constraintlayout.widget.Guideline
         android:id="@+id/multipane_guideline"