Merge "Do not delete task snapshot files when user stopped." into main