Code review comment for lp://staging/~thomas-voss/location-service/robustify-event-propagation-in-case-of-multiple-providers-running

1. robustify-event-propagation-in-case-of-multiple-providers-running
2. Merge into trunk