Merge changes from topic 'badge-setting' into ub-launcher3-master

* changes:
  Add setting to turn off icon badging am: 2ab8482809
  Add setting to turn off icon badging