Merge m-c to autoland. a=merge on a CLOSED TREE

--HG--
extra : amend_source : 273d04bb1e8ee4b8c0bc59e3ce926e64bcc4aa9a

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

@@ -59,7 +59,7 @@ let extensionControlledContentIds = {
 
 function getExtensionControlledArgs(settingName) {
   switch (settingName) {
-    case "proxyConfig":
+    case "proxy.settings":
       return [document.getElementById("bundleBrand").getString("brandShortName")];
     default:
       return [];