Merge "JobScheduler: cleanup async traces"