Merge "Use notification counts (instead of assuming all 1)" into ub-launcher3-dorval
am: 35d44b4f85

Change-Id: Ia18c4c64d0fe60499bbe02c75afde0e18a2522f5