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