Destroy old target before initialising new one in demo

Change-Id: I51e06a96fe5ce65f08ebcc2c87f0a392db64fb95
Merge "Destroy old target before initialising new one in demo"