Merge "msm: camera: Use correct interface frame id"