Merge "Revert "media: disable Codec 2.0"" into qt-dev