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

Change-Id: Id53bcefc504895e014ef2c403e59ea4ee5689390