fix content settings not being properly evaluated/stored
[pvr] do not restart the PVR manager on wake, only trigger updates
FIX: actually disable omxplayer if software is selected
Merge pull request #5853 from xhaggi/pvr-revert-pvrmanager-restart-onwake

[pvr] revert re-init of PVR manager on wake
Merge pull request #5859 from popcornmix/omxplayer_disable

FIX: actually disable omxplayer if software is selected
Merge pull request #5860 from Montellese/fix_content_settings_for_real

fix content settings not being properly evaluated/stored