Enable device filtering on desktop (bug 1054981)
Merge pull request #573 from diox/use-filtering-on-desktop

Enable device filtering on desktop (bug 1054981)