Merge "Fix races related to volume and mute"