Merge "InputTracer: Trace injected events with history as separate events" into main