Merge "Add test for Uri.toSafeString"