Merge "Removing some Launcher3 dependencies from BaseIconCache" into ub-launcher3-master