Optically align heading serif font with sans-serif content font

Also, merge two definitions for h2.

Change-Id: I4f55851a9ea064bc35517e137a4a323e77bc12f6
Merge "Optically align heading serif font with sans-serif content font"