Merge changes I03f9dda1,I6cf67330 into camera.lnx.1.0-dev.1.0

* changes:
  SnapdragonCamera: Fix cropping issues with CS output
  SnapdragonCamera: Ensure smooth quit during cs processing