Merge "Refactor logic that creates a URI permission..."