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

* commit '09fac4c200d6cc463089e18ba9b2797b171b947d':
  Camera: fix wait for preview done timeout issue. DO NOT MERGE.