am 40c3ddd3: Merge "Make deliverInputEvent tracing asynchronous"

* commit '40c3ddd3a2462bc41e5fbf4932373ebd83961a6f':
  Make deliverInputEvent tracing asynchronous