Merge "Fix transition not properly removing targets on completion."