Merge "JobScheduler: remove TARE" into main