Merge "Fixing jank in folder animation." into ub-launcher3-qt-dev
am: 23bd90c442

Change-Id: If196041ecc69d1b2c3d54cf7847742bcb385b45c