Merge branch 'develop' into feature/fga/set_user_status

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -108,6 +108,14 @@ enum class FeatureFlags(
         defaultValue = { true },
         isFinished = false,
     ),
+    JumpToUnread(
+        key = "feature.jump_to_unread",
+        title = "Jump to unread messages",
+        description = "Show a button to jump to the read marker, plus a count badge on the scroll-to-bottom button " +
+            "when new messages arrive while scrolled away.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
     SlashCommand(
         key = "feature.slash_command",
         title = "Parse slash commands in the message composer",
@@ -137,6 +145,13 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
+    SendGalleryMessages(
+        key = "feature.send_gallery_messages",
+        title = "Send gallery messages",
+        description = "Allow sending multiple media items in a single message.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
     UserStatus(
         key = "feature.user_status",
         title = "User status",