Merge "msm: camera: Add recovery routine for live snapshot."