Merge "refactor MediaPlayerTest" into jb-dev