Merge "Add support for Multi-A2DP state machines per device"