Merge "Fix SoundPool.play() looping" into klp-dev