Merge mozilla-central to autoland. a=merge CLOSED TREE

browser/components/preferences/in-content/extensionControlled.js

@@ -60,13 +60,12 @@ let extensionControlledContentIds = {
 function getExtensionControlledArgs(settingName) {
   switch (settingName) {
     case "proxyConfig":
-      return [document.getElementById("bundleBrand").getString("brandShortName$
+      return [document.getElementById("bundleBrand").getString("brandShortName")];
     default:
       return [];
   }
 }
 
-
 let extensionControlledIds = {};
 
 /**