Merge "Loading generated preview on-demand instead of keeping everything in memory" into main