Merge "mm-video: vidc: Add bug fix while doing flush"