Add cdc-acm locking fix from #3836