- CameraView updated
Merge branch 'master' into API10
backport of CameraView