Merge "Partial fix for SoundPool not terminating" into klp-dev