Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3

 Conflicts:

	src/components/structures/RoomView.js

src/accessibility/KeyboardShortcuts.tsx

@@ -319,3 +319,7 @@ export const toggleDialog = () => {
         },
     });
 };
+
+export const registerShortcut = (category: Categories, defn: IShortcut) => {
+    shortcuts[category].push(defn);
+};