Eliminate duplicated code in Settings for category headers

Change-Id: I5bdba2ad4f9e1987f9e818af9d5aa96a9d558f6b
5 files changed