Merge proposals dependent on lp://staging/~thomas-voss/location-service/expose-engine-state-information

1. expose-engine-state-information
2. Dependent merge proposals