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: 7fa2ad47\" into nyc-mr1-dev-plus-aosp
am: c54b7766
Change-Id: Ifd90f5ee95ce9f1e79df30aceb24b7ead1145dca