Merge "msm: camera: icp: Avoid merging the input fences" into dev/msm-4.9-camx