Merge "Update PreferenceCategory headers to use headline font." into pi-dev