Merge branch 'master' into develop

# Conflicts:
#	test/voice-broadcast/utils/startNewVoiceBroadcastRecording-test.ts
#	yarn.lock

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.61.0",
+  "version": "3.62.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -23,7 +23,7 @@
     "package.json",
     ".stylelintrc.js"
   ],
-  "main": "./src/index.ts",
+  "main": "./lib/index.ts",
   "matrix_src_main": "./src/index.ts",
   "matrix_lib_main": "./lib/index.ts",
   "matrix_lib_typings": "./lib/index.d.ts",
@@ -94,7 +94,7 @@
     "maplibre-gl": "^1.15.2",
     "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": "22.0.0",
     "matrix-widget-api": "^1.1.1",
     "minimist": "^1.2.5",
     "opus-recorder": "^8.0.3",
@@ -256,5 +256,6 @@
     "outputDirectory": "coverage",
     "outputName": "jest-sonar-report.xml",
     "relativePaths": true
-  }
+  },
+  "typings": "./lib/index.d.ts"
 }