Merge \"Merge \\\"Ensuring we don\\\'t try and dismiss task views that are...
Merge \"Merge \\\"Ensuring we don\\\'t try and dismiss task views that are already removed.\\\" into nyc-dev am: c169a9d8 am: 48fe925e\" into nyc-mr1-dev-plus-aosp
am: 2dbf7272
Change-Id: I05ea5b4bb80ffbcc48431e7dd12c0b34e21d8a7b