Merge "Fixing issue with old tasks being visible in Overview" into nyc-mr1-dev