Also destroy target when exiting without saving changes

Previously we were only doing this after saving.

Bug: 64032
Change-Id: Ib2c18a79c1ba0c1c7de468961e92e8a41c561cf5
(cherry picked from commit db0dd687616458752d7dd049f6eff4e6349a5a1a)