Don't redraw headings

This is a prerequisite for bug 62527.

Change-Id: I0a202a2273b77fb03c62d21337f3869993712afe