- Store context inside the tracker rather than using int deviceID that was always mapped to primary context - IsPeerWatcher now based on device IDs rather than specific peers.