Merge "msm: vidc: enable mark_data feature"