Merge "Fix disconnect not sent from host when pairing is cancelled"