Merge "Camera: Fix deadlock caused by mBatchLock" into sc-dev