Merge "media: temporarily allow <Included> as top-level media_codecs.xml tag" into qt-dev