Merge "msm: camera: Fix media_entity assignment"