[Geometry data collection tasks] Geometry sometimes not visible on map when returning to task

[Geometry data collection tasks] Geometry sometimes not visible on map when returning to task #840