Merge "Improve performance of thumbnail retrieval - hot taskData flow" into main