Merge "Add null pointer checks when updating A2DP configuration values"