Added support for per-sensor and per-input sample tracking