Merge "Revert "Create new ShortcutInfo when dropping predicted deep shortcuts."" into ub-launcher3-master