Merge "Update icon badges to match spec" into ub-launcher3-dorval
am: 0fa96ea2f6

Change-Id: Ib81cc7eb79d265a82eedaeaec4630772c8c17ecf