Merge "Add fallback for missing remote animation callbacks"