merge fx-team to mozilla-central a=merge

browser/base/content/newtab/search.js

@@ -158,7 +158,10 @@ let gSearch = {
     let image = document.createElementNS(XUL_NAMESPACE, "image");
     if (engine.iconBuffer) {
       let blob = new Blob([engine.iconBuffer]);
-      image.setAttribute("src", URL.createObjectURL(blob));
+      let size = Math.round(16 * window.devicePixelRatio);
+      let sizeStr = size + "," + size;
+      let uri = URL.createObjectURL(blob) + "#-moz-resolution=" + sizeStr;
+      image.setAttribute("src", uri);
     }
     box.appendChild(image);
 

services/fxaccounts/FxAccounts.jsm

@@ -203,7 +203,7 @@ AccountState.prototype = {
     if (!this.isCurrent) {
       log.info("An accountState promise was rejected, but we are ignoring that" +
                "reason and rejecting it due to a different user being signed in." +
-               "Originally rejected with: " + reason);
+               "Originally rejected with: " + error);
       return Promise.reject(new Error("A different user signed in"));
     }
     return Promise.reject(error);