Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock

package.json

@@ -1,6 +1,6 @@
 {
     "name": "matrix-react-sdk",
-    "version": "3.84.0",
+    "version": "3.84.1",
     "description": "SDK for matrix.org using React",
     "author": "matrix.org",
     "repository": {
@@ -101,7 +101,7 @@
         "maplibre-gl": "^2.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
         "matrix-events-sdk": "0.0.1",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "30.0.1",
         "matrix-widget-api": "^1.5.0",
         "memoize-one": "^6.0.0",
         "minimist": "^1.2.5",