Bug 4576: track both FingerId and TrackId
3 files changed