Merge "Hide MediaPlayer2 and related classes" into qt-dev