Merge "Increase ScanResult cache eviction timeout for failed/aborted scans"