Merge "Improving highlight for Clear-all button." into ub-launcher3-edmonton