Bug 857342: Don't animate the tab counter if the BrowserToolbar isn't visible. [r=mfinkle]
Bug 857120: Revert awesomebar overdraw to save action-bar. [r=mfinkle]
Bug 784739 - Switch from NULL to nullptr in content/; r=ehsan

--HG--
extra : rebase_source : cfdb682506acc14ec811e21ae42f067950e1ff0c