Merge "Add folder shapes for corresponding icon shapes" into main