am bd61103f: am be03b28f: Merge "Camera: Pause preview when needing to delete...
am bd61103f: am be03b28f: Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev
* commit 'bd61103f':
Camera: Pause preview when needing to delete jpeg/zsl streams