Merge "Fix race condition with remote animation cancel/finish" into main