Merge "PBAP abort operations when disconnected" into nyc-dev