Merge "Small tweaks to positioning Clear-all button" into ub-launcher3-edmonton