Merge "Give PBAP permission only after user confirms" into pi-dev