Revert automatically listing UPnP servers among video sources

This reverts two commits from #5492 which automatically add UPnP servers to the list of video sources (not as sources, just like removable devices) upon discovery. Apparently not everyone likes this behaviour. The other three commits from #5492 were fixes so they should be ok.