descrambler: implement proper TS queue flush before key change, fixes #2171
descrambler: move the key change code to proper location