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