03d5fe
diff -up mozilla-aurora/browser/app/profile/firefox.js.addons mozilla-aurora/browser/app/profile/firefox.js
03d5fe
--- mozilla-aurora/browser/app/profile/firefox.js.addons	2014-05-06 13:17:13.000000000 +0200
03d5fe
+++ mozilla-aurora/browser/app/profile/firefox.js	2014-05-06 14:16:32.678968008 +0200
03d5fe
@@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.sha1Fing
03d5fe
 
03d5fe
 // Disable add-ons that are not installed by the user in all scopes by default.
03d5fe
 // See the SCOPE constants in AddonManager.jsm for values to use here.
03d5fe
-pref("extensions.autoDisableScopes", 15);
03d5fe
+pref("extensions.autoDisableScopes", 0);
03d5fe
+pref("extensions.showMismatchUI", false);
03d5fe
 
03d5fe
 // Dictionary download preference
03d5fe
 pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
03d5fe
diff -up mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm
03d5fe
--- mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons	2014-05-06 14:16:32.680968014 +0200
03d5fe
+++ mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-05-06 14:17:29.482132549 +0200
03d5fe
@@ -1894,7 +1894,7 @@ this.XPIProvider = {
03d5fe
         this.showUpgradeUI();
03d5fe
         flushCaches = true;
03d5fe
       }
03d5fe
-      else if (aAppChanged === undefined) {
03d5fe
+      else {
03d5fe
         // For new profiles we will never need to show the add-on selection UI
03d5fe
         Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
03d5fe
       }