Merge "Use new icon stepping logic for Folders" into main