Merge "Bluetooth MaxConnectedAudioDevices show correct number"