Resolved invalidated draggability

Resolves #2578 where marker draggability is invalidated when changing
marker icon