Merge "msm: vidc: Fix mutex lock deadlock issue"