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

Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0