Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev