Merge "Add cameraserver process"