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

Change-Id: I84a6ad1e5e02c06635c6297fdae70ef448caf2d4