Merge "Don't use flow for one-off get of ThumbnailData" into main