Merge "Fix icons not rendering in folder migration" into ub-launcher3-rvc-dev