Merge "msm: vidc: Fix power collapse issue" into msm-4.9