Merge branch 't/sound_device_lock'