Merge "Ensure lines are not drawn on pixel edges" into tm-dev