Merge "Use ContentPreview's thumbnail loader rather than ImageUtil."