Merge "Fix naming convention in CameraService" into sc-dev