Use poll flag for sane instead of switching between watchers
Update changelog