diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eed88ef68..3c2277f70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,10 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+env:
+  # Make the git branch for a PR available to our Fastfile
+  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
+
 jobs:
   build:
     name: Build
@@ -39,7 +43,7 @@ jobs:
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3    
       - name: Use right MatrixKit and MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_pending_releases
+        run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
       - name: Build iOS simulator
@@ -75,7 +79,7 @@ jobs:
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3    
       - name: Use right MatrixKit and MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_pending_releases
+        run: bundle exec fastlane point_dependencies_to_related_branches
 
       # Main step
       - name: Unit tests
diff --git a/CHANGES.rst b/CHANGES.rst
index bb675c16e..b3f7cd088 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,8 @@ Changes to be released in next version
 🐛 Bugfix
  * RoomVC: Avoid navigation to integration management using integration popup with settings set to integration disabled (#4261).
  * RiotSettings: Logging out resets RiotSettings (#4259).
+ * RoomVC: Crash in `setScrollToBottomHidden` method (#4270).
+ * Notifications: Make them work in debug mode (#4274).
 
 ⚠️ API Changes
  * 
@@ -19,7 +21,7 @@ Changes to be released in next version
  * 
     
 🧱 Build
- * 
+ * GH Actions: Make jobs use the right version of MatrixKit and MatrixSDK.
 
 Others
  * 
diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift
index 7a8259772..597876852 100644
--- a/Config/AppConfiguration.swift
+++ b/Config/AppConfiguration.swift
@@ -44,6 +44,9 @@ class AppConfiguration: CommonConfiguration {
         // Each room member will be considered as a potential contact.
         MXKContactManager.shared().contactManagerMXRoomSource = MXKContactManagerMXRoomSource.all
         
+        // Use UIKit BackgroundTask for handling background tasks in the SDK
+        MXSDKOptions.sharedInstance().backgroundModeHandler = MXUIKitBackgroundModeHandler()
+        
         // Enable key backup on app
         MXSDKOptions.sharedInstance().enableKeyBackupWhenStartingMXCrypto = true
     }
diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
index 75202356d..1583fdc78 100644
--- a/Config/CommonConfiguration.swift
+++ b/Config/CommonConfiguration.swift
@@ -63,11 +63,6 @@ class CommonConfiguration: NSObject, Configurable {
         // Disable identicon use
         sdkOptions.disableIdenticonUseForUserAvatar = true
         
-        DispatchQueue.main.async {
-            // Use UIKit BackgroundTask for handling background tasks in the SDK
-            sdkOptions.backgroundModeHandler = MXUIKitBackgroundModeHandler()
-        }
-        
         // Pass httpAdditionalHeaders to the SDK
         sdkOptions.httpAdditionalHeaders = BuildSettings.httpAdditionalHeaders
         
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 6f73bdcff..b063db1f8 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1397,8 +1397,7 @@ const NSUInteger kJumpToUnreadCloseButtonTintColorForDarkMode = 0x6F7882;
         if (roomDataSource.currentTypingUsers && !roomDataSource.currentTypingUsers.count)
         {
             [roomDataSource resetTypingNotification];
-            NSInteger count = [self.bubblesTableView numberOfRowsInSection:0];
-            [self.bubblesTableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:count - 1 inSection:0]] withRowAnimation:UITableViewRowAnimationNone];
+            [self.bubblesTableView reloadData];
         }
     }