Merge "Add more checks for location access"