Merge "fix font-scaling from clipping folder child icons" into main