Merge "Fade original icon's text in as popup closes" into ub-launcher3-dorval-polish