Adding a preference to keep the markers on the same trace, if possible

[keenon]

This helps with the case where markers cross over each other due to splined gap filling.