Merge "Explicitly close sound model file descriptors" into tm-dev