Merge "ion: msm: fix bug with handle id handling"