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

Change-Id: I9a9cfb2d8b4756a9b484ec4698a94a85d2a7383a