Merge "SnapdragonCamera: Fixed NPE during camera resume" into camera.lnx.1.0-dev.1.0