Add device state management in traceMan bundle