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

Change-Id: Ib55a3b8c0c369a14989b4155a81c3844f99d59bb