Merge "Show notification icon in place of "1" in badge." into ub-launcher3-master