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

* commit 'bd61103faef2f75053c86764ae59b3b78d293448':
  Camera: Pause preview when needing to delete jpeg/zsl streams