Merge "Add tracepoints for potential performance issues" into qt-dev