Merge "Removing some launcher cross dependency in BaseIconCache so that it can eventually be moved to icon library" into ub-launcher3-master