Merge "audio: Restructure A2DP active device change"