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

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