Merge "msm: vidc: do not set video state to DEINIT very early"