Merge pull request #4630 from Red-F/gotham-resume-pvr-lastplayedposition