remove the marker widget in the trackcontrol when this control is created in gridtrajectorycontrol
Merge remote-tracking branch 'origin/master'