Revert "merged upnp watched status"

This reverts commit dbaefe9a92954005c3c5d50bfa2f24a69a0725bd.