Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58
am: df2ecdf3f0

Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb