Fixing crash when the focused task was removed.

- The previous fix didn’t work when the stack changed and the focused 
  task indices shifted.  It’s easier to just keep track of the focused
  task so that we can clean it up directly.

Bug: 25975225
Change-Id: I1e345044165d3a0a5eab29fb8c2a3f59df615832