Merge "Fix logic of animator start/cancel/end callbacks"