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

Change-Id: I9b553e7d76c084ec75ad6e964a835665b14a3316