Merge "Fix NPE when finishing remote animation"