Merge "Updating the shortcut preview generation logic" into ub-launcher3-master