Merge "Apply non-aggregate sched qos profile" into main