Merge "Fix potential NPE when callback remote animator"