Merge "msm: perf: clean up duplicate constraint events"