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

Change-Id: Icbcaafecde7cc222f30377b24e0f4ae7ab4cb449