Merge "do not request location from unavailable providers" into klp-dev