--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1662,21 +1662,16 @@ public class BrowserApp extends GeckoApp
             Telemetry.addToHistogram("FENNEC_FAVICONS_COUNT", db.getCount(cr, "favicons"));
             Telemetry.addToHistogram("FENNEC_THUMBNAILS_COUNT", db.getCount(cr, "thumbnails"));
             Telemetry.addToHistogram("FENNEC_READING_LIST_COUNT", db.getReadingListAccessor().getCount(cr));
             Telemetry.addToHistogram("BROWSER_IS_USER_DEFAULT", (isDefaultBrowser(Intent.ACTION_VIEW) ? 1 : 0));
             Telemetry.addToHistogram("FENNEC_TABQUEUE_ENABLED", (TabQueueHelper.isTabQueueEnabled(BrowserApp.this) ? 1 : 0));
             if (Versions.feature16Plus) {
                 Telemetry.addToHistogram("BROWSER_IS_ASSIST_DEFAULT", (isDefaultBrowser(Intent.ACTION_ASSIST) ? 1 : 0));
             }
-
-            final SharedPreferences sharedPrefs = GeckoSharedPrefs.forApp(BrowserApp.this);
-            if (sharedPrefs.getBoolean(GeckoPreferences.PREFS_OPEN_URLS_IN_PRIVATE, false)) {
-                Telemetry.addToHistogram("FENNEC_OPEN_URLS_IN_PRIVATE", 1);
-            }
         } else if ("Updater:Launch".equals(event)) {
             handleUpdaterLaunch();
         } else {
             super.handleMessage(event, message, callback);
         }
     }
 
     private void getFaviconFromCache(final EventCallback callback, final String url) {

--- a/mobile/android/base/java/org/mozilla/gecko/Tabs.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
@@ -850,22 +850,16 @@ public class Tabs implements GeckoEventL
         boolean background = delayLoad || (flags & LOADURL_BACKGROUND) != 0;
 
         try {
             boolean isPrivate = (flags & LOADURL_PRIVATE) != 0;
             boolean userEntered = (flags & LOADURL_USER_ENTERED) != 0;
             boolean desktopMode = (flags & LOADURL_DESKTOP) != 0;
             boolean external = (flags & LOADURL_EXTERNAL) != 0;
 
-            final SharedPreferences sharedPrefs =  GeckoSharedPrefs.forApp(mAppContext);
-            final boolean isPrivatePref = sharedPrefs.getBoolean(GeckoPreferences.PREFS_OPEN_URLS_IN_PRIVATE, false);
-            if (isPrivatePref && external) {
-                isPrivate = true;
-            }
-
             args.put("url", url);
             args.put("engine", searchEngine);
             args.put("parentId", parentId);
             args.put("userEntered", userEntered);
             args.put("isPrivate", isPrivate);
             args.put("pinned", (flags & LOADURL_PINNED) != 0);
             args.put("desktopMode", desktopMode);
 

--- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
@@ -126,17 +126,16 @@ OnSharedPreferenceChangeListener
     private static final String PREFS_GEO_LEARN_MORE = NON_PREF_PREFIX + "geo.learn_more";
     private static final String PREFS_HEALTHREPORT_LINK = NON_PREF_PREFIX + "healthreport.link";
     private static final String PREFS_DEVTOOLS_REMOTE_USB_ENABLED = "devtools.remote.usb.enabled";
     private static final String PREFS_DEVTOOLS_REMOTE_WIFI_ENABLED = "devtools.remote.wifi.enabled";
     private static final String PREFS_DEVTOOLS_REMOTE_LINK = NON_PREF_PREFIX + "remote_debugging.link";
     private static final String PREFS_SYNC = NON_PREF_PREFIX + "sync";
     private static final String PREFS_TRACKING_PROTECTION = "privacy.trackingprotection.state";
     private static final String PREFS_TRACKING_PROTECTION_PB = "privacy.trackingprotection.pbmode.enabled";
-    public static final String PREFS_OPEN_URLS_IN_PRIVATE = NON_PREF_PREFIX + "openExternalURLsPrivately";
     public static final String PREFS_VOICE_INPUT_ENABLED = NON_PREF_PREFIX + "voice_input_enabled";
     public static final String PREFS_QRCODE_ENABLED = NON_PREF_PREFIX + "qrcode_enabled";
     private static final String PREFS_ADVANCED = NON_PREF_PREFIX + "advanced.enabled";
     private static final String PREFS_ACCESSIBILITY = NON_PREF_PREFIX + "accessibility.enabled";
     private static final String PREFS_CUSTOMIZE_HOME = NON_PREF_PREFIX + "customize_home";
     private static final String PREFS_TRACKING_PROTECTION_PRIVATE_BROWSING = "privacy.trackingprotection.pbmode.enabled";
     private static final String PREFS_TRACKING_PROTECTION_LEARN_MORE = NON_PREF_PREFIX + "trackingprotection.learn_more";
     private static final String PREFS_CLEAR_PRIVATE_DATA = NON_PREF_PREFIX + "privacy.clear";
@@ -696,23 +695,16 @@ OnSharedPreferenceChangeListener
 
                 pref.setOnPreferenceChangeListener(this);
                 if (PREFS_UPDATER_AUTODOWNLOAD.equals(key)) {
                     if (!AppConstants.MOZ_UPDATER) {
                         preferences.removePreference(pref);
                         i--;
                         continue;
                     }
-                } else if (PREFS_OPEN_URLS_IN_PRIVATE.equals(key)) {
-                    // Remove UI for opening external links in private browsing on non-Nightly builds.
-                    if (!AppConstants.NIGHTLY_BUILD || !Restrictions.isAllowed(this, Restrictable.PRIVATE_BROWSING)) {
-                        preferences.removePreference(pref);
-                        i--;
-                        continue;
-                    }
                 } else if (PREFS_TRACKING_PROTECTION.equals(key)) {
                     // Remove UI for global TP pref in non-Nightly builds.
                     if (!AppConstants.NIGHTLY_BUILD) {
                         preferences.removePreference(pref);
                         i--;
                         continue;
                     }
                 } else if (PREFS_TRACKING_PROTECTION_PB.equals(key)) {

--- a/mobile/android/base/resources/xml-v11/preferences_general.xml
+++ b/mobile/android/base/resources/xml-v11/preferences_general.xml
@@ -28,15 +28,10 @@
                         android:title="@string/pref_scroll_title_bar2"
                         android:summary="@string/pref_scroll_title_bar_summary" />
 
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
-    <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
-                        android:title="@string/pref_open_external_urls_privately_title"
-                        android:summary="@string/pref_open_external_urls_privately_summary"
-                        android:defaultValue="false" />
-
 </PreferenceScreen>
 

--- a/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
+++ b/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
@@ -30,15 +30,10 @@
                android:value="preferences_locale" />
     </PreferenceScreen>
 
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
-    <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
-                        android:title="@string/pref_open_external_urls_privately_title"
-                        android:summary="@string/pref_open_external_urls_privately_summary"
-                        android:defaultValue="false" />
-
 </PreferenceScreen>
 

--- a/mobile/android/base/resources/xml/preferences_general.xml
+++ b/mobile/android/base/resources/xml/preferences_general.xml
@@ -34,15 +34,10 @@
                         android:title="@string/pref_scroll_title_bar2"
                         android:summary="@string/pref_scroll_title_bar_summary" />
 
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
-    <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
-                        android:title="@string/pref_open_external_urls_privately_title"
-                        android:summary="@string/pref_open_external_urls_privately_summary"
-                        android:defaultValue="false" />
-
 </PreferenceScreen>
 

--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -9270,21 +9270,21 @@
     "n_values": 3,
     "description": "The number of times the tab queue prompt was seen before the user selected NO."
   },
   "FENNEC_TABQUEUE_ENABLED": {
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "Has the tab queue functionality been enabled."
   },
-  "FENNEC_OPEN_URLS_IN_PRIVATE": {
-    "alert_emails": ["margaret@mozilla.com"],
+  "VIDEO_EME_DISABLED": {
+    "alert_emails": ["edwin@mozilla.com"],
     "expires_in_version": "45",
-    "kind": "flag",
-    "description": "Reports the state of the open external links in private tabs preference"
+    "kind": "boolean",
+    "description": "Set if media.eme.enabled is false, in a build that supports the Adobe Primetime Content Decryption Module."
   },
   "GRAPHICS_DRIVER_STARTUP_TEST": {
     "alert_emails": ["danderson@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "releaseChannelCollection": "opt-out",
     "description": "Reports whether or not graphics drivers crashed during startup."