Keep (un)star up to date when adding/removing watcher.
Merge pull request #1851 from opf/fix/star-unstar-when-removing-watcher

Keep (un)star up to date when adding/removing watcher.