Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev