Merge "Apply correct line-height to diffs"