diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 72fcaf86..6fb36e46 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     private boolean mIsFirstRun = true;
     protected boolean mIsGoingBack = false;
     private boolean mIsPrimaryUser;
-    private int mResultCode = 0;
+    protected int mResultCode = 0;
     private Intent mResultData;
 
     @Override
@@ -520,7 +520,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     }
 
     protected int getTransition() {
-        return TRANSITION_ID_DEFAULT;
+        return TRANSITION_ID_SLIDE;
     }
 
     protected boolean tryEnablingWifi() {
diff --git a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
index 598e92a5..15503bc8 100644
--- a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
+++ b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,11 +54,6 @@ public class CaptivePortalSetupActivity extends SubBaseActivity {
                 .checkForCaptivePortal(mCaptivePortalUrl, this, true);
     }
 
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_FADE;
-    }
-
     private static class CheckForCaptivePortalTask extends AsyncTask<Void, Void, Boolean> {
 
         private final URL captivePortalUrl;
diff --git a/src/org/lineageos/setupwizard/ChooseDataSimActivity.java b/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
index ddab9130..2d552fa7 100644
--- a/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
+++ b/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -229,11 +229,6 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity {
         }
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     private void checkForRadioReady() {
         if (mRadioReady) {
             mHandler.removeCallbacks(mRadioReadyRunnable);
diff --git a/src/org/lineageos/setupwizard/DateTimeActivity.java b/src/org/lineageos/setupwizard/DateTimeActivity.java
index 46369380..8a6d3a17 100644
--- a/src/org/lineageos/setupwizard/DateTimeActivity.java
+++ b/src/org/lineageos/setupwizard/DateTimeActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,11 +159,6 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements
         unregisterReceiver(mIntentReceiver);
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.setup_datetime_page;
diff --git a/src/org/lineageos/setupwizard/FingerprintActivity.java b/src/org/lineageos/setupwizard/FingerprintActivity.java
index 80681a83..04a0f476 100644
--- a/src/org/lineageos/setupwizard/FingerprintActivity.java
+++ b/src/org/lineageos/setupwizard/FingerprintActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,10 +70,4 @@ public class FingerprintActivity extends SubBaseActivity {
                 getString(R.string.settings_fingerprint_setup_details));
         startSubactivity(intent, REQUEST_CODE_SETUP_FINGERPRINT);
     }
-
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
 }
diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
index d401e350..b1483c63 100644
--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -72,11 +72,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
         setNextText(R.string.start);
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.finish_activity;
@@ -85,7 +80,9 @@ public class FinishActivity extends BaseSetupWizardActivity {
     @Override
     public void finish() {
         super.finish();
-        overridePendingTransition(R.anim.translucent_enter, R.anim.translucent_exit);
+        if (!isResumed() || mResultCode != RESULT_CANCELED) {
+            overridePendingTransition(R.anim.translucent_enter, R.anim.translucent_exit);
+        }
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index 5eba7a42..4041f4bd 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -139,11 +139,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         nextAction(NEXT_REQUEST, intent);
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.setup_lineage_settings;
diff --git a/src/org/lineageos/setupwizard/LocaleActivity.java b/src/org/lineageos/setupwizard/LocaleActivity.java
index 9f9b025e..936d4bb6 100644
--- a/src/org/lineageos/setupwizard/LocaleActivity.java
+++ b/src/org/lineageos/setupwizard/LocaleActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,11 +105,6 @@ public class LocaleActivity extends BaseSetupWizardActivity {
         }
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.setup_locale;
diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 12c44771..4924f5c9 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -59,11 +59,6 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
         mLocationAccess.setChecked(mLocationManager.isLocationEnabled());
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.location_settings;
diff --git a/src/org/lineageos/setupwizard/MobileDataActivity.java b/src/org/lineageos/setupwizard/MobileDataActivity.java
index b14bbf1a..b071273c 100644
--- a/src/org/lineageos/setupwizard/MobileDataActivity.java
+++ b/src/org/lineageos/setupwizard/MobileDataActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -179,11 +179,6 @@ public class MobileDataActivity extends BaseSetupWizardActivity {
         mPhoneMonitor.removeListener(mSubscriptionStateListener);
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     private void hideWaitForRadio() {
         if (mProgressBar.isShown()) {
             mHandler.removeCallbacks(mRadioReadyRunnable);
diff --git a/src/org/lineageos/setupwizard/ScreenLockActivity.java b/src/org/lineageos/setupwizard/ScreenLockActivity.java
index 3e2443ec..70b619b3 100644
--- a/src/org/lineageos/setupwizard/ScreenLockActivity.java
+++ b/src/org/lineageos/setupwizard/ScreenLockActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,11 +51,6 @@ public class ScreenLockActivity extends SubBaseActivity {
         });
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.setup_lockscreen;
@@ -81,11 +76,6 @@ public class ScreenLockActivity extends SubBaseActivity {
         startSubactivity(intent, REQUEST_CODE_SETUP_LOCKSCREEN);
     }
 
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     private boolean isKeyguardSecure() {
         return getSystemService(KeyguardManager.class).isKeyguardSecure();
     }
diff --git a/src/org/lineageos/setupwizard/SimMissingActivity.java b/src/org/lineageos/setupwizard/SimMissingActivity.java
index 1dfc69f9..b0c30d12 100644
--- a/src/org/lineageos/setupwizard/SimMissingActivity.java
+++ b/src/org/lineageos/setupwizard/SimMissingActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,11 +67,6 @@ public class SimMissingActivity extends BaseSetupWizardActivity {
         }
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.sim_missing_page;
diff --git a/src/org/lineageos/setupwizard/SubBaseActivity.java b/src/org/lineageos/setupwizard/SubBaseActivity.java
index c02e1577..32a58869 100644
--- a/src/org/lineageos/setupwizard/SubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/SubBaseActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,16 +148,11 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
     }
 
     protected int getSubactivityPreviousTransition() {
-        return TRANSITION_ID_DEFAULT;
+        return TRANSITION_ID_SLIDE;
     }
 
     protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_DEFAULT;
-    }
-
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_FADE;
+        return TRANSITION_ID_SLIDE;
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 16178698..63dcc54e 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,11 +52,6 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
         startEmergencyDialer();
     }
 
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     @Override
     protected int getLayoutResId() {
         return R.layout.welcome_activity;
diff --git a/src/org/lineageos/setupwizard/WifiSetupActivity.java b/src/org/lineageos/setupwizard/WifiSetupActivity.java
index b488eaa7..a3096091 100644
--- a/src/org/lineageos/setupwizard/WifiSetupActivity.java
+++ b/src/org/lineageos/setupwizard/WifiSetupActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,10 +40,4 @@ public class WifiSetupActivity extends SubBaseActivity {
         intent.putExtra(SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT, (String) null);
         startSubactivity(intent, REQUEST_CODE_SETUP_WIFI);
     }
-
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
 }
diff --git a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
index 9e295a34..3ced83de 100644
--- a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
+++ b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2019-2020 The Calyx Institute
+ * Copyright (C) 2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +48,6 @@ public class RestoreIntroActivity extends SubBaseActivity {
         return R.drawable.ic_restore;
     }
 
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
     private void launchRestore() {
         Intent intent = new Intent(ACTION_RESTORE_FROM_BACKUP);
         startSubactivity(intent, REQUEST_CODE_RESTORE);