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

Change-Id: I55fa44886486d2306076cb8699a097a1a8820a0d