diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 0b5b652cf5..3f86922c8e 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -425,7 +425,8 @@
             android:name=".ActivityBilling"
             android:exported="false"
             android:icon="@mipmap/ic_launcher"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:taskAffinity="${applicationId}.BILLING" />
 
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
@@ -576,6 +577,8 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
+        <!-- https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration -->
+        <!-- https://issuetracker.google.com/issues/138465476 -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index ab44a8fe1b..644e4fe7ff 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -431,7 +431,8 @@
             android:name=".ActivityBilling"
             android:exported="false"
             android:icon="@mipmap/ic_launcher"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:taskAffinity="${applicationId}.BILLING" />
 
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
@@ -582,6 +583,8 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
+        <!-- https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration -->
+        <!-- https://issuetracker.google.com/issues/138465476 -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index f446bbe8c7..d8b9597def 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -431,7 +431,8 @@
             android:name=".ActivityBilling"
             android:exported="false"
             android:icon="@mipmap/ic_launcher"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:taskAffinity="${applicationId}.BILLING" />
 
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
@@ -582,6 +583,8 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
+        <!-- https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration -->
+        <!-- https://issuetracker.google.com/issues/138465476 -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 60bbb61943..d6a6cd9017 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -423,7 +423,8 @@
             android:name=".ActivityBilling"
             android:exported="false"
             android:icon="@mipmap/ic_launcher"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:taskAffinity="${applicationId}.BILLING" />
 
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index d4bed40902..c053aa18c9 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -425,7 +425,8 @@
             android:name=".ActivityBilling"
             android:exported="false"
             android:icon="@mipmap/ic_launcher"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:taskAffinity="${applicationId}.BILLING" />
 
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
@@ -576,6 +577,8 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
+        <!-- https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration -->
+        <!-- https://issuetracker.google.com/issues/138465476 -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"