Merge changes I4b61ef85,I8f97648d into main

* changes:
  InputTracer: Ensure eventProcessingComplete called after dropping events
  InputTracer: Minor readability improvements