Emit location_added/removed event on entities
Merge and close #384