More omx teardown tweaks.
Merge remote-tracking branch 'upstream/master' into channellist
OSD channellist