Merge "SnapdragonCamera: Change cameraId use getCurrentCameraId method"