Merge "msm: vidc: Re-program the vbif settings post-power collapse"