Merge "Fix style sheets for expanded context lines"