Merge "Icon size should update when grid config changes" into ub-launcher3-master