Merge "Theme updates for dark text:" into ub-launcher3-edmonton