Merge "msm: vidc: Set proper height and width." into msm-3.4