Merge "Fix NPE when creating remote animations"