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

diff --cc app/helpers/accounts_helper.rb
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/javascript/packs/public.js
Simple merge

diff --cc app/serializers/rest/status_serializer.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/simple_form.ja.yml
Simple merge