Merge "SnapdragonCamera: Camera2 force close after focused" into camera.lnx.1.0-dev.1.0