Merge "Add a fall back for when the thumbnail is not generated for a task" into nyc-dev