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

* commit 'de1c4b84374a3626459bd339b0680b6311ef4e29':

Change-Id: Id4b193ecf314a2829f68a61f53f4fca925e809c9