Merge "Refactor location permissions code"