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

Change-Id: I0f86f2cf5f99d0ba9c069562655f2d26f292026e