Merge "SnapdragonCamera:Improve camera app's robustness" into camera.lnx.1.0-dev.1.0