Merge "Check provider exists and is enabled when request location" into pi-dev