Merge "Sanitize Uri.toSafeString() some more." into tm-dev