Issue 3127 - Merge conflicts, base 42.0.1

mobile/android/base/resources/xml-v11/preferences.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Phone v11+ only: Sync is a top-level menu item.
      See xml-v11/preference_headers.xml for tablet layout.
      Preference changes here should be mirrored to xml/preferences.xml.in. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
 
-    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
-                                                  android:title="@string/pref_sync"
-                                                  android:summary="@string/pref_sync_summary"
-                                                  android:persistent="false" />
-
     <PreferenceScreen android:title="@string/pref_category_customize"
                       android:summary="@string/pref_category_customize_summary"
                       android:key="android.not_a_preference.customize_screen"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_customize"/>
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_display"
                       android:summary="@string/pref_category_display_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
                       android:key="android.not_a_preference.display.enabled" >
         <extra android:name="resource"
                android:value="preferences_display" />
     </PreferenceScreen>
 
 
     <PreferenceScreen android:title="@string/pref_category_privacy_short"
                       android:summary="@string/pref_category_privacy_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_privacy" />
     </PreferenceScreen>
 
+    <!-- Adblocking preferences -->
+    <PreferenceScreen android:title="@string/abb_pref_category_adblocking"
+                      android:summary="@string/abb_pref_category_adblocking_summary_main"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_abb_abp" />
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_language"
                       android:summary="@string/pref_category_language_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_locale" />
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_vendor"
                       android:summary="@string/pref_category_vendor_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_vendor"/>
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/pref_category_devtools"
-                      android:summary="@string/pref_developer_remotedebugging"
-                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-                      android:key="android.not_a_preference.devtools.enabled" >
-        <extra android:name="resource"
-               android:value="preferences_devtools"/>
-    </PreferenceScreen>
+    <!-- Removed devtools as part of https://issues.adblockplus.org/ticket/2353 -->
 
 </PreferenceScreen>