Bug 938205 - Remove unused imports from BrowserToolbar (r=sriram)
Bug 938205 - Factor out editing UI into ToolbarEditLayout (r=sriram)