Merge "Fix nuplayer seek jankiness by properly flushing decoders before"