Merge "Folder preview polish." into sc-dev