Merge "Refrain from overwriting shortcut icon with default icon" into ub-launcher3-master