Make sure to cleanup swift on unstack/relaunch.

- Fixes bug 1049553.

Change-Id: I9fef93d25512c014dfb882adf0e169487bf877d8
Merge "Make sure to cleanup swift on unstack/relaunch."