Merge "PBAP: Fix NullPointerException in stop()"