Merge "PBAP: Send remaining contacts instead of error on Contact deletion" into pi-dev