Merge "Move basic events into the sched category in atrace." into qt-dev