Merge "Update folder preview and folder background colors." into sc-v2-dev