Merge "Use colorSecondary for darker bg color." into ub-launcher3-calgary