Merge "Use default icon if notification icon is null." into ub-launcher3-dorval