Merge "Prevent return giant size thumbnail"