Merge "disable MediaPlayer2 tests" into pi-dev