Merge "Ensure notification icons have enough contrast with background." into ub-launcher3-master