China battles COVID-19 surge after dropping strict lockdown measures