Heads up: move preference header from bottom of category to underneath hover

This seems like a better spot and makes room for future potential style category
if more options are added.

Change-Id: I452d8e52c71520e22a809ff149aeb87d36e2ac73
Merge "Heads up: move preference header from bottom of category to underneath hover" into kk44