Merge commit '3ed16489d05d701e62be5038adbe2891c1a3ac1d' into glitch-soc/merge-upstream

Conflicts:
- `yarn.lock`:
  Upstream dependency updated textually adjacent to glitch-soc dependency

app/javascript/mastodon/features/account_edit/featured_tags.tsx

@@ -96,7 +96,7 @@ function renderTag(tag: ApiFeaturedTagJSON) {
       {tag.statuses_count > 0 && (
         <FormattedMessage
           id='account_edit_tags.tag_status_count'
-          defaultMessage='{count} posts'
+          defaultMessage='{count, plural, one {# post} other {# posts}}'
           values={{ count: tag.statuses_count }}
           tagName='p'
         />