Merge "Ensure that animaiton.end() is properly dispatched" into ub-launcher3-edmonton