Merge "Fix Folder text animation bugs." into ub-launcher3-dorval-polish
am: f729eb5291

Change-Id: Ifada9dc9eb4a7fd2c79f0a741d7998e9431a92bf