Trump teases ‘not too distant’ China visit amid thaw in trade war and rare earth shipments