Merge "Remove MediaItem2" into qt-dev
am: 4e57ccbea9

Change-Id: I73ba96b5a48dab7a6cc4a428739368034fe334c8