Merge "msm: camera: Fix flash issue timeout"