Merge "Adjust offset for non-AA line drawing"