diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 4b7f1ac41d..d462867ae0 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -313,7 +313,8 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:parentActivityName=".ActivityView"
- android:resizeableActivity="true">
+ android:resizeableActivity="true"
+ android:taskAffinity="${applicationId}.COMPOSE">
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 7d887cf170..59fe4e8a46 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -320,7 +320,8 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:parentActivityName=".ActivityView"
- android:resizeableActivity="true">
+ android:resizeableActivity="true"
+ android:taskAffinity="${applicationId}.COMPOSE">
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 31a24f44fe..a5a14f5db6 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -319,7 +319,8 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:parentActivityName=".ActivityView"
- android:resizeableActivity="true">
+ android:resizeableActivity="true"
+ android:taskAffinity="${applicationId}.COMPOSE">
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index aff25a2cfd..aeb9a08463 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -319,7 +319,8 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:parentActivityName=".ActivityView"
- android:resizeableActivity="true">
+ android:resizeableActivity="true"
+ android:taskAffinity="${applicationId}.COMPOSE">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 143f70095b..2413c19ea1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -315,7 +315,8 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:parentActivityName=".ActivityView"
- android:resizeableActivity="true">
+ android:resizeableActivity="true"
+ android:taskAffinity="${applicationId}.COMPOSE">
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 7c9769976f..01dffe27a6 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -313,7 +313,8 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:parentActivityName=".ActivityView"
- android:resizeableActivity="true">
+ android:resizeableActivity="true"
+ android:taskAffinity="${applicationId}.COMPOSE">