CameraFramesWatcher fix
merge conflict fix