Merge "msm: camera: icp: IPE and BPS interframe power collapse" into dev/msm-4.9-camx