Merge change 5220 into donut

* changes:
  Cleanup header file. Disallow copy of Camera object by making copy constructor and operator= private.