Merge "Fix SoundPool lockup" into lmp-dev