Fix Core update rollback: delay image cleanup and fix missing rollback path

Fix Core update rollback: delay image cleanup and fix missing rollback path #10946