Merge "Fix restart after EOS for mp3"