Merge "Deduping shortcuts to app-shortcuts if they have a valid intent" into ub-launcher3-burnaby