Merge "Fix issue where player would not be dismissed" into rvc-dev