Bug 1112556 - Ctrl-Tab previews are oversized with a small number of tabs open. r=dao

--HG--
extra : rebase_source : ec1e0f19a6c482ddb8ee65360b4656dfe7b905bd
Bug 647540 - Get rid of the toolbar-primary class. r=enn

--HG--
extra : rebase_source : 3b1bf2598d73f7242945e4296df947f66dbeaf0a