Merge "Don't wait for thumbnails to update if updatedThumbnails are empty" into main