This fixes #7675.  This was only a problem with virtual devices.  Physical devices worked fine.