Merge "Media - Fix old players being left around"