Merge changes I30f4c21d,Ie9a5fbd5 into main

* changes:
  InputTracer: Add timestamp to perfetto trace packets
  InputDispatcher: Fix pointer count when canceling a subset of pointers