Merge "Prevent old callback events when track is recycled"
am: eb6c38a9eb

Change-Id: I22bcbdd72e3eb038af18a535227876621b7ec2b1