Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev