Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"