Merge "Deleting invalid icons when an app is restored" into ub-launcher3-edmonton-polish