Merge "Fix unnecessary and harmful task movement."