Workaround constraint layout flow/barrier bug

Refs androidx/constraintlayout#390

app/build.gradle

@@ -275,7 +275,7 @@ dependencies {
     def webkit_version = "1.4.0"
     def recyclerview_version = "1.2.1"
     def coordinatorlayout_version = "1.1.0"
-    def constraintlayout_version = "2.0.4"
+    def constraintlayout_version = "2.1.0"
     def material_version = "1.4.0"
     def browser_version = "1.3.0"
     def lbm_version = "1.0.0"

app/src/main/res/layout/include_message_navigation.xml

@@ -5,6 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/workaround"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
         <View
             android:id="@+id/vSeparator"
             android:layout_width="match_parent"
@@ -387,13 +395,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
             app:srcCompat="@drawable/twotone_fullscreen_24" />
-
+    </androidx.constraintlayout.widget.ConstraintLayout>
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/barrier_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="ibTools,ibFlow,ibVerify,ibDecrypt,ibImages,ibFull" />
 
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvReformatted"
@@ -405,7 +407,7 @@
         android:textStyle="italic"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/barrier_action" />
+        app:layout_constraintTop_toBottomOf="@id/workaround" />
 
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvSignedData"