Merge "Respect badge settings to filter out badges" into ub-launcher3-dorval
am: 5bbba815fd

Change-Id: I76a153ab357c5597758aac11348f1e304495fd70