Merge "Revert "Fixing issue with old tasks being visible in Overview"" into nyc-mr1-dev
am: 99cf874cc3

Change-Id: Ie6a26e075211c380c1ea49cff7f877e22e7bae3e