diff --git a/dev/benchmarks/complex_layout/android/AndroidManifest.xml b/dev/benchmarks/complex_layout/android/AndroidManifest.xml
index 794a13f5d7..62938bc9d8 100644
--- a/dev/benchmarks/complex_layout/android/AndroidManifest.xml
+++ b/dev/benchmarks/complex_layout/android/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
     <application android:name="org.domokit.sky.shell.SkyApplication" android:label="complex_layout" android:icon="@mipmap/ic_launcher">
         <activity android:name="org.domokit.sky.shell.SkyActivity"
-                  android:launchMode="singleTask"
+                  android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
                   android:hardwareAccelerated="true"
diff --git a/dev/manual_tests/android/AndroidManifest.xml b/dev/manual_tests/android/AndroidManifest.xml
index 98a4eaf553..6dc8b6db9d 100644
--- a/dev/manual_tests/android/AndroidManifest.xml
+++ b/dev/manual_tests/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application android:label="Flutter Manual Tests" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/hello_android/app/src/main/AndroidManifest.xml b/examples/hello_android/app/src/main/AndroidManifest.xml
index c36839439d..d420159971 100644
--- a/examples/hello_android/app/src/main/AndroidManifest.xml
+++ b/examples/hello_android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <application android:name="org.domokit.sky.shell.SkyApplication" android:label="@string/app_name" >
         <activity
             android:name=".ExampleActivity"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:theme="@android:style/Theme.Black.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
             android:hardwareAccelerated="true"
diff --git a/examples/hello_world/android/AndroidManifest.xml b/examples/hello_world/android/AndroidManifest.xml
index 6d96b4e727..17a082ed43 100644
--- a/examples/hello_world/android/AndroidManifest.xml
+++ b/examples/hello_world/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application android:label="Flutter Hello" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/layers/android/AndroidManifest.xml b/examples/layers/android/AndroidManifest.xml
index e81d6863a6..9f51c5e6bc 100644
--- a/examples/layers/android/AndroidManifest.xml
+++ b/examples/layers/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application android:label="Flutter Layers" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/material_gallery/android/AndroidManifest.xml b/examples/material_gallery/android/AndroidManifest.xml
index 951c123523..3e7f58dcd1 100644
--- a/examples/material_gallery/android/AndroidManifest.xml
+++ b/examples/material_gallery/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application android:icon="@mipmap/ic_launcher" android:label="Flutter Material" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/stocks/android/AndroidManifest.xml b/examples/stocks/android/AndroidManifest.xml
index 9f86c788c4..563b51544e 100644
--- a/examples/stocks/android/AndroidManifest.xml
+++ b/examples/stocks/android/AndroidManifest.xml
@@ -11,7 +11,7 @@
 
     <application android:icon="@mipmap/ic_launcher" android:name="org.domokit.sky.shell.SkyApplication" android:label="Stocks">
         <activity android:name="org.domokit.sky.shell.SkyActivity"
-                  android:launchMode="singleTask"
+                  android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
                   android:hardwareAccelerated="true">
diff --git a/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl b/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl
index 3cc4855142..73812c9d10 100644
--- a/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl
+++ b/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl
@@ -8,7 +8,7 @@
 
     <application android:name="org.domokit.sky.shell.SkyApplication" android:label="{{projectName}}" android:icon="@mipmap/ic_launcher">
         <activity android:name="org.domokit.sky.shell.SkyActivity"
-                  android:launchMode="singleTask"
+                  android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
                   android:hardwareAccelerated="true"