Sync watch/unwatch status with shared servers

Early 2021 clean-up: duplicate