Merge branch 'beta' into release

# Conflicts:
#	app-k9mail/build.gradle.kts
#	app-k9mail/src/main/res/raw/changelog_master.xml
#	app-thunderbird/build.gradle.kts
#	app-thunderbird/src/main/res/raw/changelog_master.xml