Merge branch 'origin-6.711' into upstream-6.711

# Conflicts:
#	app/core/src/main/java/com/fsck/k9/K9.kt
#	app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
#	app/ui/legacy/src/main/res/drawable-v26/ic_e_launcher.xml
#	app/ui/legacy/src/main/res/drawable-v26/ic_launcher.xml
#	app/ui/legacy/src/main/res/layout/fragment_about.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/layout/message_view_header.xml
#	app/ui/legacy/src/main/res/values-ar/strings.xml
#	app/ui/legacy/src/main/res/values-be/strings.xml
#	app/ui/legacy/src/main/res/values-bg/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-cs/strings.xml
#	app/ui/legacy/src/main/res/values-cy/strings.xml
#	app/ui/legacy/src/main/res/values-da/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-eo/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-eu/strings.xml
#	app/ui/legacy/src/main/res/values-fa/strings.xml
#	app/ui/legacy/src/main/res/values-fi/strings.xml
#	app/ui/legacy/src/main/res/values-fr/strings.xml
#	app/ui/legacy/src/main/res/values-fy/strings.xml
#	app/ui/legacy/src/main/res/values-gd/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-is/strings.xml
#	app/ui/legacy/src/main/res/values-it/strings.xml
#	app/ui/legacy/src/main/res/values-iw/strings.xml
#	app/ui/legacy/src/main/res/values-ja/strings.xml
#	app/ui/legacy/src/main/res/values-ko/strings.xml
#	app/ui/legacy/src/main/res/values-lt/strings.xml
#	app/ui/legacy/src/main/res/values-lv/strings.xml
#	app/ui/legacy/src/main/res/values-ml/strings.xml
#	app/ui/legacy/src/main/res/values-nb/strings.xml
#	app/ui/legacy/src/main/res/values-nl/strings.xml
#	app/ui/legacy/src/main/res/values-pl/strings.xml
#	app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
#	app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
#	app/ui/legacy/src/main/res/values-ro/strings.xml
#	app/ui/legacy/src/main/res/values-ru/strings.xml
#	app/ui/legacy/src/main/res/values-sk/strings.xml
#	app/ui/legacy/src/main/res/values-sl/strings.xml
#	app/ui/legacy/src/main/res/values-sq/strings.xml
#	app/ui/legacy/src/main/res/values-sr/strings.xml
#	app/ui/legacy/src/main/res/values-sv/strings.xml
#	app/ui/legacy/src/main/res/values-tr/strings.xml
#	app/ui/legacy/src/main/res/values-uk/strings.xml
#	app/ui/legacy/src/main/res/values-v26/drawables.xml
#	app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
#	app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
#	app/ui/legacy/src/main/res/values/drawables.xml
#	app/ui/legacy/src/main/res/values/strings.xml
#	app/ui/legacy/src/main/res/values/themes.xml
#	backend/demo/src/main/resources/inbox/intro.eml
#	feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/data/InMemoryAccountSetupStateRepository.kt
#	feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/validation/InMemoryAuthStateStorage.kt
#	gradle.properties
#	gradle/libs.versions.toml
#	gradle/wrapper/gradle-wrapper.properties