Merge branch 'master' into '125-save-the-text-scaling-you-have-set-for-all-pages'

# Conflicts:
#   src/assets/i18n/home/en.json
5 jobs for 125-save-the-text-scaling-you-have-set-for-all-pages in 7 minutes and 51 seconds (queued for 1 second)