Merge "SoundPool: Improve single stream SoundPool handling"