Bug 995161 - Customize mode can still break after bootstrapped add-on with custom legacy:true toolbar restarts. r=Gijs.

--HG--
rename : browser/components/customizableui/test/browser_989609_bootstrapped_custom_toolbar.js => browser/components/customizableui/test/browser_bootstrapped_custom_toolbar.js
Bug 989683 - restrict how we inherit the menubar text color to tabsintitlebar cases on non-aero, r=dao
Bug 971034 - adjust min-height of zoom control reset button only, r=jaws
Merge m-c to fx-team.
merge fx-team to m-c