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

Change-Id: I94cdaf8570592941f3fd304e21ed90302fbfb561