am f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev

* commit 'f85769797e14f0d10dcc99d695c6dee1eb56bd9c':
  Also consider task intent when trimming recent tasks