This patch also updates the method names on PendingAnimationTracker but leaves a number of local variables which will be fixed in a subsequent patch.