Merge "InputEventTimeline field fixes" into main