am 36a8b33a: Merge "camera: Fix race condition between setParameters() and...
am 36a8b33a: Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
* commit '36a8b33a':
camera: Fix race condition between setParameters() and stopPreview().