am cc6cc873: Merge "DO NOT MERGE: Revert "Camera: fix wait for preview done...
am cc6cc873: Merge "DO NOT MERGE: Revert "Camera: fix wait for preview done timeout issue."" into klp-dev
* commit 'cc6cc873':
DO NOT MERGE: Revert "Camera: fix wait for preview done timeout issue."