Merge commit 'e097f0e9eb76514efc405f3d1cef0692ff4cff35' into glitch-soc/merge-upstream

Conflicts:
- `yarn.lock`:
  glitch-soc-specific dependency too close to a dependency updated upstream.
  Updated dependencies as upstream did.

app/javascript/styles/mastodon/components.scss

@@ -10399,6 +10399,10 @@ noscript {
       bdi {
         color: $darker-text-color;
       }
+
+      .account__avatar {
+        flex: 0 0 auto;
+      }
     }
 
     &__content {