Merge "camera.device@3.2: Minor updates"