Issue 7387 - Onboarding shown again after upgrade

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

Index: mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
===================================================================
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1110,17 +1110,21 @@
             // in the firstrun pane being shown.
             return;
         }
         final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();
 
         try {
             final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this);
 
+            // Mozilla changed the preference name, thus the first run is being shown again after updating. We don't want that
+            // See https://issues.adblockplus.org/ticket/7387
+            final String prefFirstRunEnabledBefore57 = GeckoPreferences.NON_PREF_PREFIX + "startpane_enabled";
             if (prefs.getBoolean(FirstrunAnimationContainer.PREF_FIRSTRUN_ENABLED_OLD, true) &&
+                prefs.getBoolean(prefFirstRunEnabledBefore57, true) &&
                 prefs.getBoolean(FirstrunAnimationContainer.PREF_FIRSTRUN_ENABLED, true)) {
                 showSplashScreen = false;
                 if (!Intent.ACTION_VIEW.equals(intent.getAction())) {
                     // Check to see if a distribution has turned off the first run pager.
                     final Distribution distribution = Distribution.getInstance(BrowserApp.this);
                     if (!distribution.shouldWaitForSystemDistribution()) {
                         checkFirstrunInternal();
                     } else {