Bug 933964 - Don't call unifiedToolbarHeight on NSWindows that are not ToolbarWindows, r=smichaud
Bug 935556 - fix ui-button tests to continue using sdk/self, r=gozala
Merge mozilla-central and ux