Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

app/models/user.rb

@@ -445,7 +445,6 @@ class User < ApplicationRecord
     return if chosen_languages.nil?
 
     chosen_languages.compact_blank!
-
     self.chosen_languages = nil if chosen_languages.empty?
   end