Merge "SnapdragonCamera: Camera force close" into camera.lnx.1.0-dev.1.0