Add resume handling
ResumePlayer and SRT fix
Sync
Merge Fix
More merge fixes