Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev