bug 829093 - we will get both onerror event and system message for
pairing cancelled, but we only need to handle it once.
Bug - 827382 followup - fixing a regression on inbound
r=kaze
Merge pull request #7515 from evelynhung/issue-829093

bug 829093 - we will get both onerror event and system message for pairing cancelled, but we only need to handle it once. r=timdream, a=blocking-basecamp
Merge pull request #7545 from etiennesegonzac/settings-inbound-fix

Bug 827382 followup - fixing a regression on inbound
Auto-merge from branch 'master'