Merge "Add location permissions required"