Merge "New, better line drawing implementation. Bug #3207544 Bug #3225875"