Merge "Fix crash trying to add data: URLs to icon db"