Merge remote-tracking branch 'upstream/master' into feat/self-declare-nsfw

# Conflicts:
#	src/app/modules/channels/channel.component.scss
#	src/app/modules/legacy/components/buttons/user-dropdown.ts