Merge "Improve handling of external deletion in LauncherProvider.delete" into ub-launcher3-calgary-polish