Merge fx-team to m-c. a=merge

browser/base/content/contentSearchUI.js

browser/base/content/pageinfo/security.js

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

browser/devtools/shared/widgets/filter-widget.css

browser/locales/en-US/chrome/browser/search.properties

browser/modules/ContentSearch.jsm

js/src/jsapi.cpp

js/src/jsapi.h

js/src/vm/Interpreter.cpp

js/src/vm/Runtime.cpp

js/src/vm/Runtime.h

mobile/android/base/BrowserApp.java

mobile/android/base/IntentHelper.java

mobile/android/base/ZoomedView.java

mobile/android/base/toolbar/BrowserToolbar.java

mobile/android/tests/browser/robocop/helpers/WaitHelper.java

toolkit/components/passwordmgr/LoginHelper.jsm

toolkit/components/perfmonitoring/PerformanceStats.jsm

toolkit/components/perfmonitoring/nsIPerformanceStats.idl

toolkit/components/perfmonitoring/nsPerformanceStats.cpp