Merge pull request #16275 from coolljt0725/fix_register_failed_and_start

Fix container register failed during daemon start and then start the container