Merge "Remove thumbnail cache"