Merge "Refactor resetTaskIfNeededLocked for tasks."