Merge changes Ibd05948e,Iff48671a

* changes:
  leaudio: Improve active device handling
  leaudio: Minor typo fix