am b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev

* commit 'b8f0090af19b95027d2e08667c662d058832f94b':
  Camera2: On stopping preview, wait until captures are completed.