Merge "Fix unpair device when disconnected for No Bonding"