Merge "Fix indexoutofbounds folder preview" into main