Merge "Improved ImageDownloader code."