Merge "msm: camera: Enable ZSL for 5MP sensor (ov5647)" into msm-3.0