China's Xi says HK situation improved from 'chaos'