Merge "Update Soundpool callback interface" into tm-dev