Merge "Fixing URL encoding of geo intent links"