Merge proposals dependent on lp://staging/~thomas-voss/location-service/deliver-updates-to-visible-satellites

1. deliver-updates-to-visible-satellites
2. Dependent merge proposals