Merge change 7981

* changes:
  Update Pointer Location app to show multiple pointers.