Merge "A2DP offload: switch to new properties + swap audio XML files"