Merge "Allow for dismissing resumable players" into rvc-qpr-dev