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

 Conflicts:

	src/settings/Settings.ts

	src/settings/UIFeature.ts

src/settings/Settings.ts

@@ -618,6 +618,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.Widgets]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
     [UIFeature.Feedback]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,

src/settings/UIFeature.ts

@@ -17,5 +17,6 @@ limitations under the License.
 // see settings.md for documentation on conventions
 export enum UIFeature {
     URLPreviews = "UIFeature.urlPreviews",
+    Widgets = "UIFeature.widgets",
     Feedback = "UIFeature.feedback",
 }