Issue 3127 - Merge conflicts, base 42.0.1

mobile/android/base/resources/menu-v11/browser_app_menu.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/. -->
 
 <!-- We disable AlwaysShowAction because we interpret the menu
      attributes ourselves and thus the warning isn't relevant to us. -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:tools="http://schemas.android.com/tools"
       tools:ignore="AlwaysShowAction">
@@ skipping 42 matching lines @@
           android:title="@string/new_tab"/>
 
     <item android:id="@+id/new_private_tab"
           android:icon="@drawable/ic_menu_new_private_tab"
           android:title="@string/new_private_tab"/>
 
     <item android:id="@+id/find_in_page"
           android:icon="@drawable/ic_menu_find_in_page"
           android:title="@string/find_in_page" />
 
+    <item android:id="@+id/abb_block_ads"
+          android:title="@string/abb_block_ads"
+          android:enabled="false"
+          android:checkable="true" />
+
     <item android:id="@+id/desktop_mode"
           android:icon="@drawable/ic_menu_desktop_mode_off"
           android:title="@string/desktop_mode"
           android:checkable="true" />
 
     <item android:id="@+id/page"
           android:title="@string/page"
           android:icon="@drawable/ic_menu_tools">
 
         <menu>
@@ skipping 22 matching lines @@
           android:icon="@drawable/ic_menu_tools">
 
         <menu>
 
             <item android:id="@+id/downloads"
                   android:icon="@drawable/ic_menu_downloads"
                   android:title="@string/downloads"/>
 
             <item android:id="@+id/addons"
                   android:icon="@drawable/ic_menu_addons"
+                  android:visible="false"
                   android:title="@string/addons"/>
 
             <item android:id="@+id/logins"
                   android:title="@string/logins"/>
 
             <item android:id="@+id/new_guest_session"
                   android:icon="@drawable/ic_menu_guest"
                   android:visible="false"
                   android:title="@string/new_guest_session"/>
 
             <item android:id="@+id/exit_guest_session"
                   android:icon="@drawable/ic_menu_guest"
                   android:visible="false"
                   android:title="@string/exit_guest_session"/>
 
         </menu>
 
     </item>
 
     <item android:id="@+id/char_encoding"
           android:icon="@drawable/ic_menu_character_encoding"
           android:visible="false"
           android:title="@string/char_encoding"/>
 
     <item android:id="@+id/settings"
           android:icon="@drawable/ic_menu_settings"
           android:title="@string/settings" />
 
     <item android:id="@+id/help"
+          android:visible="false"
           android:title="@string/help_menu" />
 
 </menu>