Merge "mw.feedback: Remove a hack with passing message parameters"