Further fixes to the background flag watcher

The "enabled" property is no longer used, so removing.

If the flag watcher is cancelled (because the folder has been closed),
the watcher was still rescheduling another polling loop.  This patch
prevents that.