Merge \"Badging shortcuts with app icons\" into ub-launcher3-calgary
am: 66d17ca32d

Change-Id: I726a35f9267c2e1561a6da91eff77a32a07b772b