Merge "msm: camera: Fix for dual ISP buffer management"