Merge "De-dupe shortcuts with the same id as the main notification." into ub-launcher3-dorval
am: c3dfed43eb

Change-Id: I60bbede53d61f117596e90eb3363a4cb5eac7245