Merge "Remove MediaPlayer2 from media apex." into qt-dev