Merge "Updating FolderIcon drawing to avoid dependency on software layer." into ub-launcher3-dorval