Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream

Fix import order inconsistencies (#2289)

Convert `<DismissableBanner>` to Typescript (#25582)

Rewrite `<ShortNumber />` as FC and TS (#25492)

simplify counters (#25541)

Fix translate button position (#25807)

Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'main' into glitch-soc/merge-upstream

Add canonical link tags in web UI (#25715)

Add button to see results for polls in web UI (#25726)

Fix local live feeds does not expand (#25694)

Add at-symbol prepended to mention span title (#25684)

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>

Change labels of live feeds tabs in web UI (#25683)

Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'main' into glitch-soc/merge-upstream

Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663)

Change dropdown icon above compose form from ellipsis to bars in web UI (#25661)

Change local and federated timelines to be in a single firehose column (#25641)

Use an Immutable Record as the root state (#25584)

Fix onboarding prompt being displayed because of disconnection gaps (#25617)