Merge "Add shell command to reset the frozen task state" into main