Merge "Reset state amanger, when switching from state animation to task launch animation" into ub-launcher3-edmonton