Merge "CameraService: Further fixes to default camera counts"