Merge remote-tracking branch 'origin/dm-notifications-enhancements' into dm-notifications-enhancements

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

@@ -54,7 +54,7 @@
                     android:id="@+id/mute_messages_label"
                     style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
@@ -80,7 +80,7 @@
                     android:id="@+id/mute_mentions_label"
                     style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"