Merge "A2DP switch device refactor"