Made previous fix work for VideoPlayer and MediaPlayer fixes #2620