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

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.

app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx

@@ -34,7 +34,7 @@ export const EmbeddedStatusContent: React.FC<{
       className={className}
       lang={status.get('language') as string}
       htmlString={status.get('contentHtml') as string}
-      extraEmojis={status.get('emoji') as List<CustomEmoji>}
+      extraEmojis={status.get('emojis') as List<CustomEmoji>}
     />
   );
 };