Merge "Ensuring we don't try and dismiss task views that are already removed." into nyc-dev