Merge "Fix issue with All Tasks Dismissed" into nyc-dev