Merge "msm: ipc: Refactor the code that processes control messages"