Merge "Loading proper app icon if the associated activity is null" into ub-launcher3-master