Merge "leaudio: Improve active device handling"