Merge "Don't draw divider under headers" into nyc-mr1-dev