Merge change 6997 into donut

* changes:
  Rename IActivityWatcher to IActivityController