Merge "Updating folder shape when icon shape changes" into ub-launcher3-master