Merge "Clear references to animation runner when the animation ends." into pi-dev