Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093

 Conflicts:

	src/components/views/spaces/SpaceTreeLevel.tsx

	src/dispatcher/actions.ts

	src/i18n/strings/en_EN.json

src/settings/Settings.tsx

@@ -124,6 +124,7 @@ export interface ISetting {
     // not use this for new settings.
     invertedSettingName?: string;
 
+    // XXX: Keep this around for re-use in future Betas
     betaInfo?: {
         title: string; // _td
         caption: string; // _td