Bug 933964 - Don't call unifiedToolbarHeight on NSWindows that are not ToolbarWindows, r=smichaud
Merge mozilla-central and ux