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

Change-Id: Id6c987bea6d45eb421cccff520ae78bf874c82f9