Revert "Merge remote-tracking branch 'remotes/origin/MP1-3172_TVService_ignores_shutdown_(reopened)'"

This reverts commit 7dc3ca727cec92623b980f6dd037f2778f34ef21, reversing
changes made to 404b28d63f8089312ec29876ca3aa04c484402d1.
TVE3 code freeze. (need to be ported to TVE3.5)