Merge birch to m-c.

b2g/app/b2g.js

@@ -610,7 +610,7 @@ pref("hal.processPriorityManager.gonk.LowCPUNice", 18);
 // this too high, then we'll send out a memory pressure event every Z seconds
 // (see below), even while we have processes that we would happily kill in
 // order to free up memory.
-pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 10);
+pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 14);
 
 // We wait this long before polling the memory-pressure fd after seeing one
 // memory pressure event.  (When we're not under memory pressure, we sit

b2g/chrome/content/identity.js

@@ -109,13 +109,16 @@ function doInternalRequest() {
             method: 'login',
             assertion: assertion,
             _internalParams: internalParams});
+        } else {
+          identityCall({
+            method: 'cancel'
+          });
         }
         closeIdentityDialog();
       },
       stringifiedOptions);
   }
 }
-
 function doInternalLogout(aOptions) {
   log("doInternalLogout:", (options && isLoaded));
   if (options && isLoaded) {