Merge "Fix bug where folder with 1 icon can exist" into 24D1-dev