Trump says a China trip is ‘not too distant’ as trade tensions ease