Keep active setup in recent apps screen

app/src/amazon/AndroidManifest.xml

@@ -188,7 +188,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -196,7 +195,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"

app/src/fdroid/AndroidManifest.xml

@@ -192,7 +192,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -200,7 +199,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"

app/src/github/AndroidManifest.xml

@@ -192,7 +192,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -200,7 +199,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"

app/src/main/AndroidManifest.xml

@@ -187,7 +187,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -195,7 +194,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"

app/src/main/java/eu/faircode/email/ActivitySetup.java

@@ -470,9 +470,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
     public void onBackStackChanged() {
         int count = getSupportFragmentManager().getBackStackEntryCount();
         if (count == 0) {
-            if (hasAccount)
+            if (hasAccount) {
                 startActivity(new Intent(this, ActivityView.class));
-            finish();
+                finishAndRemoveTask();
+            } else
+                finish();
         } else {
             if (drawerLayout.isDrawerOpen(drawerContainer))
                 drawerLayout.closeDrawer(drawerContainer);

app/src/play/AndroidManifest.xml

@@ -188,7 +188,6 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
@@ -196,7 +195,6 @@
 
         <activity
             android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup"