Merge "Cleaning up some animation states:" into ub-launcher3-qt-dev am: 37dc5b1936
am: 0669538f24

Change-Id: I546b1475280fc0de11d64f2c506daddb364329da