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

Change-Id: I823af96d8e17f5232cbd6c4cf75587b10309a56c