Merge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev am: 6f53a85569
am: e439e9b505

Change-Id: Ifa9fe4dba1ba574e45416531b389020c05a19dc4