Merge "Adding tracepoints for tracking lock icon state" into qt-dev