Merge "Remove badge info from map when count is 0." into ub-launcher3-dorval
am: 0402efbad8

Change-Id: I4134b0df23339d5c376a31b9e0f9cd8518e62f0e