diff --git a/mobile/android/base/gfx/BitmapUtils.java b/mobile/android/base/gfx/BitmapUtils.java
index cd029adbfd2..905a79c29b1 100644
--- a/mobile/android/base/gfx/BitmapUtils.java
+++ b/mobile/android/base/gfx/BitmapUtils.java
@@ -61,6 +61,11 @@ public final class BitmapUtils {
                             return GeckoJarReader.getBitmapDrawable(context.getResources(), data);
                         }
 
+                        // Don't attempt to validate the JAR signature when loading an add-on icon
+                        if (data.startsWith("jar:file")) {
+                            return GeckoJarReader.getBitmapDrawable(context.getResources(), Uri.decode(data));
+                        }
+
                         URL url = new URL(data);
                         InputStream is = (InputStream) url.getContent();
                         try {
diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java
index 2ca0df7a7ee..9f70430c919 100644
--- a/mobile/android/base/home/BrowserSearch.java
+++ b/mobile/android/base/home/BrowserSearch.java
@@ -877,13 +877,13 @@ public class BrowserSearch extends HomeFragment
         }
 
         @Override
-        public boolean onInterceptTouchEvent(MotionEvent event) {
+        public boolean onTouchEvent(MotionEvent event) {
             if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
                 // Dismiss the soft keyboard.
                 requestFocus();
             }
 
-            return super.onInterceptTouchEvent(event);
+            return super.onTouchEvent(event);
         }
     }
 }
diff --git a/toolkit/mozapps/update/tests/unit_aus_update/downloadResumeForSameAppVersion.js b/toolkit/mozapps/update/tests/unit_aus_update/downloadResumeForSameAppVersion.js
index 03827297bc6..e9e5030be37 100644
--- a/toolkit/mozapps/update/tests/unit_aus_update/downloadResumeForSameAppVersion.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/downloadResumeForSameAppVersion.js
@@ -30,7 +30,15 @@ function run_test() {
   }
   do_check_eq(gUpdateManager.activeUpdate.state, STATE_DOWNLOADING);
 
-  do_test_finished();
+  // Pause the download and reload the Update Manager with an empty update so
+  // the Application Update Service doesn't write the update xml files during
+  // xpcom-shutdown which will leave behind the test directory.
+  gAUS.pauseDownload();
+  writeUpdatesToXMLFile(getLocalUpdatesXMLString(""), true);
+  writeUpdatesToXMLFile(getLocalUpdatesXMLString(""), false);
+  reloadUpdateManagerData();
+
+  do_timeout(TEST_CHECK_TIMEOUT, do_test_finished);
 }
 
 function end_test() {