Merge "Expand nuplayer mutex for mediametrics management" into qt-dev