Merge "Using common method for updating icons in cache" into ub-launcher3-master