Merge "SoftVorbis: handle flush as well as flush with CSD"