Merge "Don't disconnect an A2DP device when connecting to same device"