Merge "fix(scmi): use same type for message_id" into integration