Merge "API for location settings injection" into klp-dev