Merge "Reducing the number of recent tasks we keep." into nyc-dev am: 9e935820b5
am: 4f4152a9e2

* commit '4f4152a9e2a302f834ec97bf3a38e77bbd8e318c':

Change-Id: Idf548cd51e0a76db7e63278e963112f626310948