Merge "Use promisedIntent instead of intent when deep shortcuts are restored." into ub-launcher3-calgary-polish