Merge "Clean up duplicate lambda in cameraserver device3 code."