Xbox One to launch in China this month after all