Extend display-message to work for control clients. GitHub issue 3449.