Remove control from existing map in onAdd (fixes #3020)