Merge "Fix empty thumbnail/icon by re-fetching data from cache" into main