Bug 853235 - Combine pairing-related system messages into one type, r=echou