--- a/mobile/android/app/src/main/res/xml/preferences_advanced.xml
+++ b/mobile/android/app/src/main/res/xml/preferences_advanced.xml
@@ -63,20 +63,21 @@
     <PreferenceCategory android:title="@string/pref_category_developer_tools">
 
         <SwitchPreference android:key="devtools.remote.usb.enabled"
                           android:title="@string/pref_developer_remotedebugging_usb" />
 
         <SwitchPreference android:key="devtools.remote.wifi.enabled"
                           android:title="@string/pref_developer_remotedebugging_wifi" />
 
-        <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.qrreader.link"
-                                                                android:title="@string/pref_developer_remotedebugging_wifi_install_reader"
-                                                                android:persistent="false"
-                                                                url="https://play.google.com/store/apps/details?id=com.google.zxing.client.android" />
+        <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.remote_debugging.qrreader.link"
+                                                      android:title="@string/pref_developer_remotedebugging_wifi_install_reader"
+                                                      android:summary="@string/pref_developer_remotedebugging_wifi_disabled_summary"
+                                                      android:persistent="false"
+                                                      url="https://play.google.com/store/apps/details?id=com.google.zxing.client.android" />
 
         <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
                                                                 android:title="@string/pref_learn_more"
                                                                 android:persistent="false"
                                                                 url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
     </PreferenceCategory>
 
     <PreferenceCategory

--- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
@@ -705,18 +705,18 @@ public class GeckoPreferences
                 } else if (PREFS_DEVTOOLS_REMOTE_WIFI_ENABLED.equals(key)) {
                     if (!Restrictions.isAllowed(this, Restrictable.REMOTE_DEBUGGING)) {
                         preferences.removePreference(pref);
                         i--;
                         continue;
                     }
                     if (!InputOptionsUtils.supportsQrCodeReader(getApplicationContext())) {
                         // WiFi debugging requires a QR code reader
-                        pref.setEnabled(false);
-                        pref.setSummary(getString(R.string.pref_developer_remotedebugging_wifi_disabled_summary));
+                        preferences.removePreference(pref);
+                        i--;
                         continue;
                     } else {
                         final Preference installLink = preferences.findPreference(PREFS_DEVTOOLS_REMOTE_INSTALL_READER);
                         preferences.removePreference(installLink);
                         continue;
                     }
                 } else if (PREFS_DEVTOOLS_REMOTE_LINK.equals(key)) {
                     // Remove the "Learn more" link if remote debugging is disabled

--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -205,17 +205,17 @@
      context means consuming less data, e.g. by not loading images, not
      “storing data”. -->
 <!ENTITY pref_category_advanced_summary3 "Restore tabs, data saver, developer tools">
 <!ENTITY pref_category_notifications "Notifications">
 <!ENTITY pref_category_notifications_summary "New features, website updates">
 <!ENTITY pref_developer_remotedebugging_usb "Remote debugging via USB">
 <!ENTITY pref_developer_remotedebugging_wifi "Remote debugging via Wi-Fi">
 <!ENTITY pref_developer_remotedebugging_wifi_disabled_summary "Wi-Fi debugging requires your device to have a QR code reader app installed.">
-<!ENTITY pref_developer_remotedebugging_wifi_install_reader "Install QR code reader">
+<!ENTITY pref_developer_remotedebugging_wifi_install_reader "Install Barcode Scanner">
 <!ENTITY pref_remember_signons2 "Remember logins">
 <!ENTITY pref_manage_logins "Manage logins">
 
 <!ENTITY pref_category_home "Home">
 <!ENTITY pref_category_home_summary "Customize your homepage">
 <!ENTITY pref_category_home_panels "Panels">
 <!ENTITY pref_category_home_add_ons "Add-ons">
 <!ENTITY pref_home_updates2 "Content updates">