Bug 767313 - Merge the Tabs category into the General category in in-content preferences. r=Unfocused