Merge "Unifying various icon loading methods" into ub-launcher3-master