Merge "Changing the FolderIcon shape based on AdpativeIcon" into ub-launcher3-master