Add section headers back to group lists

Bug 29509309
Bug 18641067

Change-Id: I94a4ae9c9bc6f0df5f8f8e51c13dd2e9435d63cd
3 files changed