[PliExtraInfo] fix possible BSOD.
[ChannelSelection] slight cleanup.
Merge remote-tracking branch 'upstream/master'