Merge "Fix some state issues with user-controlled animations" into ub-launcher3-edmonton