[FMS-254] If a popup content is provided, don't render the template. Bug fix: Check if there is a newIncidentMaker before trying to remove its layer.