Merge "Remove LoadThumbnailTask to avoid using AsyncTask"