Merge "msm: camera: Copy the frame_id from the diverted frame."