Merge "msm: camera: icp: Add timeout for hfi commands and fix hardcode values"