Merge "Add some synchronous input trace points."