Merge "add media.swcodec to native watchdog" into qt-dev