Merge "Move trustzone tracepoints into sched category" into qt-dev