Merge remote-tracking branch 'upstream/dev' into dev

src/plugins/betterSettings/index.tsx

@@ -171,10 +171,11 @@ export default definePlugin({
     },
 
     wrapMap(toWrap: any[]) {
+        const otherOptions = getIntlMessage("OTHER_OPTIONS");
         // @ts-expect-error
         toWrap.map = function (render: (item: SettingsEntry) => ReactElement<any>) {
             return this
-                .filter(a => a.items.length > 0)
+                .filter(a => a.items.length > 0 && a.label !== otherOptions)
                 .map(({ label, items }) => {
                     const children = items.map(render);
                     if (label) {

src/plugins/gameActivityToggle/style.css

@@ -1,4 +1,3 @@
-/* make gap smaller since we're adding an extra button */
-[class^="panels"] [class^="buttons"] {
-    gap: 4px;
+[class^="panels"] [class^="avatarWrapper_"] {
+    min-width: 0;
 }