Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am: c169a9d8a1

Change-Id: I16e8679a30285ca9c1472022348861b759e1aed7