Merge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev