Merge "Cancel IdleService scans when job stopped" into mainline-prod