Merge "Fixing low res folder icon when preview changes" into main