Merge "Adding support for dark text on dark theme" into ub-launcher3-edmonton