Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
src/i18n/strings/cs.json
src/i18n/strings/de_DE.json
src/i18n/strings/fi.json
src/i18n/strings/fr.json
src/i18n/strings/it.json
src/i18n/strings/nl.json
src/i18n/strings/ru.json
src/i18n/strings/th.json