Merge "Fixing crash when trying to reset focused task after removing task."