Merge "PBAP check device on disconnect"