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

Change-Id: If17653d534eec4e79f1b07d6f8afac01629fd454