Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.

app/javascript/mastodon/features/emoji/emoji_html.tsx

@@ -51,7 +51,14 @@ export const EmojiHTML = <Element extends ElementType>(
   if (isModernEmojiEnabled()) {
     return <ModernEmojiHTML {...props} />;
   }
-  const { as: asElement, htmlString, extraEmojis, className, ...rest } = props;
+  const {
+    as: asElement,
+    htmlString,
+    extraEmojis,
+    className,
+    shallow: _,
+    ...rest
+  } = props;
   const Wrapper = asElement ?? 'div';
   return (
     <Wrapper