Merge change 352 into donut

* changes:
  Remove dangling media recorder client reference when setCamera() is used.