Merge branch 'develop' into doug/4479_media_size_selection

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings

Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionHeader.swift

@@ -25,7 +25,7 @@ struct FormSectionHeader: View {
     var body: some View {
         Text(text)
             .foregroundColor(Color(theme.textSecondaryColor))
-            .padding(.top)
+            .padding(.top, 32)
             .padding(.leading)
             .padding(.bottom, 8)
             .font(Font(theme.fonts.subheadline))

Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettingsHeader.swift

@@ -38,7 +38,6 @@ struct RoomNotificationSettingsHeader: View {
             Spacer()
         }
         .padding(.top, 36)
-        .padding(.bottom, 20)
     }
 }
 

Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift

@@ -169,7 +169,7 @@ final class RoomInfoListViewController: UIViewController {
         
         var rows = [rowSettings]
         
-        if BuildSettings.roomSettingsScreenShowNotificationsV2 {
+        if BuildSettings.showNotificationsV2 {
             rows.append(roomNotifications)
         }
         if RiotSettings.shared.roomInfoScreenShowIntegrations {

Riot/Modules/Room/Settings/RoomSettingsViewController.m

@@ -528,7 +528,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     {
         [sectionMain addRowWithTag:ROOM_SETTINGS_MAIN_SECTION_ROW_DIRECT_CHAT];
     }
-    if (!BuildSettings.roomSettingsScreenShowNotificationsV2)
+    if (!BuildSettings.showNotificationsV2)
     {
         [sectionMain addRowWithTag:ROOM_SETTINGS_MAIN_SECTION_ROW_MUTE_NOTIFICATIONS];
     }