Merge "Fixed MediaPlayer unit test issues"