Merge "msm: camera: Fixed memory leak and added NULL check" into msm-3.0