Merge "Refactor CameraService to handle errors properly." into klp-dev