Merge "Make AudioRepository#getAudioStream listen to only corresponding stream events when possible." into main