Conflicts:
	app/core/src/main/java/com/fsck/k9/K9.kt
	app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotifications.java
	app/core/src/main/java/com/fsck/k9/notification/SendFailedNotifications.java
	app/k9mail/src/main/AndroidManifest.xml
	app/ui/legacy/src/main/AndroidManifest.xml
	app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
	app/ui/legacy/src/main/res/layout/activity_onboarding.xml
	app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
	app/ui/legacy/src/main/res/layout/message.xml
	app/ui/legacy/src/main/res/values-ar/strings.xml
	app/ui/legacy/src/main/res/values-br/strings.xml
	app/ui/legacy/src/main/res/values-ca/strings.xml
	app/ui/legacy/src/main/res/values-de/strings.xml
	app/ui/legacy/src/main/res/values-el/strings.xml
	app/ui/legacy/src/main/res/values-es/strings.xml
	app/ui/legacy/src/main/res/values-et/strings.xml
	app/ui/legacy/src/main/res/values-fa/strings.xml
	app/ui/legacy/src/main/res/values-fr/strings.xml
	app/ui/legacy/src/main/res/values-gd/strings.xml
	app/ui/legacy/src/main/res/values-gl-rES/strings.xml
	app/ui/legacy/src/main/res/values-gl/strings.xml
	app/ui/legacy/src/main/res/values-hr/strings.xml
	app/ui/legacy/src/main/res/values-hu/strings.xml
	app/ui/legacy/src/main/res/values-in/strings.xml
	app/ui/legacy/src/main/res/values-ml/strings.xml
	app/ui/legacy/src/main/res/values-nl/strings.xml
	app/ui/legacy/src/main/res/values-ru/strings.xml
	app/ui/legacy/src/main/res/values-sv/strings.xml
	app/ui/legacy/src/main/res/values-zh-rTW/strings.xml