Merge pull request #3438 from hathach/ncm_restart

Fix NCM state on restart