diff --git a/DataLayer/Application/src/main/AndroidManifest.xml b/DataLayer/Application/src/main/AndroidManifest.xml
index b33ac8048..ab05e7710 100644
--- a/DataLayer/Application/src/main/AndroidManifest.xml
+++ b/DataLayer/Application/src/main/AndroidManifest.xml
@@ -34,7 +34,9 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@android:style/Theme.Material.Light.NoActionBar">
+            android:theme="@android:style/Theme.Material.Light.NoActionBar"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/DataLayer/Wearable/src/main/AndroidManifest.xml b/DataLayer/Wearable/src/main/AndroidManifest.xml
index fb6a2b628..5bf9a01fc 100644
--- a/DataLayer/Wearable/src/main/AndroidManifest.xml
+++ b/DataLayer/Wearable/src/main/AndroidManifest.xml
@@ -55,7 +55,9 @@
         </service>
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml b/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml
index 26807d301..65c7cd349 100644
--- a/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml
+++ b/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml
@@ -38,7 +38,9 @@
         <activity
             android:name=".MainPhoneActivity"
             android:launchMode="singleTask"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -49,12 +51,14 @@
         <activity
             android:name=".PhonePermissionRequestActivity"
             android:label="@string/title_activity_phone_permission_request"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:taskAffinity=".main"/>
 
         <activity
             android:name=".WearPermissionRequestActivity"
             android:label="@string/title_activity_wear_permission_request"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:taskAffinity=".main"/>
 
         <service
             android:name=".IncomingRequestPhoneService"
diff --git a/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml b/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
index 8256a38cc..8ac4b005d 100644
--- a/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
+++ b/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
@@ -35,7 +35,9 @@
 
         <activity
             android:name=".MainWearActivity"
-            android:launchMode="singleInstance">
+            android:launchMode="singleInstance"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -45,7 +47,9 @@
 
         <activity
             android:name=".RequestPermissionOnPhoneActivity"
-            android:label="@string/title_activity_request_permission_on_phone">
+            android:label="@string/title_activity_request_permission_on_phone"
+            android:taskAffinity=".main"
+            >
         </activity>
 
         <service
diff --git a/TimeText/timetexttestsupport/src/main/AndroidManifest.xml b/TimeText/timetexttestsupport/src/main/AndroidManifest.xml
index 806e898ec..a26ab8e73 100644
--- a/TimeText/timetexttestsupport/src/main/AndroidManifest.xml
+++ b/TimeText/timetexttestsupport/src/main/AndroidManifest.xml
@@ -16,6 +16,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.timetexttextsupport">
     <application>
-        <activity android:name="com.example.android.wearable.timetext.TestActivity" />
+        <activity android:name="com.example.android.wearable.timetext.TestActivity"
+            android:taskAffinity=".main"
+            />
     </application>
 </manifest>
diff --git a/TimeText/wear/src/main/AndroidManifest.xml b/TimeText/wear/src/main/AndroidManifest.xml
index 2eeb19255..0cd239af2 100644
--- a/TimeText/wear/src/main/AndroidManifest.xml
+++ b/TimeText/wear/src/main/AndroidManifest.xml
@@ -33,7 +33,9 @@
 
         <activity
             android:name="com.example.android.wearable.timetext.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/WatchFaceKotlin/app/src/main/AndroidManifest.xml b/WatchFaceKotlin/app/src/main/AndroidManifest.xml
index e397e0f9d..3c73dbe71 100644
--- a/WatchFaceKotlin/app/src/main/AndroidManifest.xml
+++ b/WatchFaceKotlin/app/src/main/AndroidManifest.xml
@@ -73,7 +73,9 @@
         <activity
             android:name=".editor.WatchFaceConfigActivity"
             android:exported="true"
-            android:label="@string/title_activity_watch_face_config">
+            android:label="@string/title_activity_watch_face_config"
+            android:taskAffinity=".main"
+            >
 
             <intent-filter>
                 <action android:name="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
diff --git a/WearOAuth/oauth-device-grant/src/main/AndroidManifest.xml b/WearOAuth/oauth-device-grant/src/main/AndroidManifest.xml
index 7b9ec9c99..72535bb92 100644
--- a/WearOAuth/oauth-device-grant/src/main/AndroidManifest.xml
+++ b/WearOAuth/oauth-device-grant/src/main/AndroidManifest.xml
@@ -35,7 +35,9 @@
 
         <activity
             android:name=".AuthDeviceGrantActivity"
-            android:label="wearoauth">
+            android:label="wearoauth"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/WearOAuth/oauth-pkce/src/main/AndroidManifest.xml b/WearOAuth/oauth-pkce/src/main/AndroidManifest.xml
index 6fc88fa0f..295b49998 100644
--- a/WearOAuth/oauth-pkce/src/main/AndroidManifest.xml
+++ b/WearOAuth/oauth-pkce/src/main/AndroidManifest.xml
@@ -35,7 +35,9 @@
 
         <activity
             android:name=".AuthPKCEActivity"
-            android:label="wearoauth">
+            android:label="wearoauth"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/WearSpeakerSample/wear/src/main/AndroidManifest.xml b/WearSpeakerSample/wear/src/main/AndroidManifest.xml
index d3ad99545..737c39dc4 100644
--- a/WearSpeakerSample/wear/src/main/AndroidManifest.xml
+++ b/WearSpeakerSample/wear/src/main/AndroidManifest.xml
@@ -37,7 +37,9 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/WearStandaloneGoogleSignIn/app/src/main/AndroidManifest.xml b/WearStandaloneGoogleSignIn/app/src/main/AndroidManifest.xml
index bde0049ca..79dcdb793 100644
--- a/WearStandaloneGoogleSignIn/app/src/main/AndroidManifest.xml
+++ b/WearStandaloneGoogleSignIn/app/src/main/AndroidManifest.xml
@@ -32,7 +32,9 @@
 
         <activity
             android:name=".GoogleSignInActivity"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/WearVerifyRemoteApp/Application/src/main/AndroidManifest.xml b/WearVerifyRemoteApp/Application/src/main/AndroidManifest.xml
index 1a5858c9d..5a61524e9 100644
--- a/WearVerifyRemoteApp/Application/src/main/AndroidManifest.xml
+++ b/WearVerifyRemoteApp/Application/src/main/AndroidManifest.xml
@@ -26,7 +26,9 @@
 
         <activity
             android:name=".MainMobileActivity"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -34,4 +36,4 @@
         </activity>
 
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml b/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
index d17a7e5ae..3cedf6d39 100644
--- a/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
+++ b/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
@@ -32,7 +32,9 @@
         <activity
             android:name=".MainWearActivity"
             android:label="@string/app_name"
-            android:exported="true">
+            android:exported="true"
+            android:taskAffinity=".main"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -40,4 +42,4 @@
         </activity>
 
     </application>
-</manifest>
\ No newline at end of file
+</manifest>