Re-enable DeviceInfoWatcher on Windows
(cherry picked from commit 3565dcb08f9df7ceb81c79e082e4099c19cee3fb)