Merge "add mediaswcodec to watchdog and dumpstate" into qt-dev