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