Merge "Updating the PreloadIconDrawable" into ub-launcher3-master