Merge changes I9fe98448,I41648d76 into main

* changes:
  InputTracer: Don't make WindowDispatchArgs an inner class
  InputTracer: Introduce TracedEventArgs to track secure events