Merge "msm: vidc: Fix issue with picture type property"