Take WASAPI specific changes from 8794076ab0c08dd3a1a2ef480676d6f1c0a08200