Merge "Change cancel/end behavior of animations to be synchronous"