Merge changes I0931837f,Ia5ce13f6

* changes:
  Cache monitored tag dump for watched clients when disconnected.
  Add 'watch' command to CameraService