Android sound effect fixes

Fix for #2308.