am 09fac4c2: am 0d95f5db: Merge "Camera: fix wait for preview done timeout...
am 09fac4c2: am 0d95f5db: Merge "Camera: fix wait for preview done timeout issue. DO NOT MERGE." into klp-dev
* commit '09fac4c2':
Camera: fix wait for preview done timeout issue. DO NOT MERGE.