Merge pull request #7486 from amaiorano/fix-infinite-polling-for-usb-devices Fix infinite polling for usb devices after the "add to whitelist" dia…
