Merge "Various icon cache fixes" into ub-launcher3-master