Merge "msm: camera: icp: Make sure to set bitmap to NULL" into dev/msm-4.9-camx