Avoid incorrect disabling PVR addons (Alternate)

Alternate to #4757.