Merge "Media - Add player sorting" into rvc-qpr-dev