Merge "msm: mpm-of: Fix incorrect setting of edge control"