Merge "mm-video: vidc: Fix race condition in resolution change"