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

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