Merge "Add setting to turn off icon badging" into ub-launcher3-dorval
am: d315d07aee

Change-Id: Id23914cbee040f3916257e02a9eb6b3f5a821b83