Merge "Don't end atomic animation when passing through state" into ub-launcher3-edmonton